add shuttle dev support, use dflt ff_a/v.png icons, mjpegtools typo patch

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / loadfile.C

diff --git a/cinelerra-5.1/cinelerra/loadfile.C b/cinelerra-5.1/cinelerra/loadfile.C
index 434edfe6e4c20b436008e4e947410a33d283bfcf..345456d976c996747b79c2852786a5186f816450 100644 (file)
--- a/cinelerra-5.1/cinelerra/loadfile.C
+++ b/cinelerra-5.1/cinelerra/loadfile.C
@@ -47,6 +47,7 @@ Load::Load(MWindow *mwindow, MainMenu *mainmenu)
 {
        this->mwindow = mwindow;
        this->mainmenu = mainmenu;
+       this->thread = 0;
 }
 
 Load::~Load()
@@ -77,6 +78,7 @@ LoadFileThread::LoadFileThread(MWindow *mwindow, Load *load)
 {
        this->mwindow = mwindow;
        this->load = load;
+       this->window = 0;
 }
 
 LoadFileThread::~LoadFileThread()
@@ -202,8 +204,8 @@ int LoadFileWindow::resize_event(int w, int h)
                LoadMode::calculate_h(this, mwindow->theme);
        loadmode->reposition_window(x, y);
 
-       x = (get_w() - BC_GenericButton::calculate_w(this, _("Apply")))/2;
-       y = get_h() - BC_GenericButton::calculate_h() - 15;
+       x = (w - BC_GenericButton::calculate_w(this, _("Apply")))/2;
+       y = h - BC_GenericButton::calculate_h() - 15;
        load_file_apply->reposition_window(x, y);
 
        return BC_FileBox::resize_event(w, h);