X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fgwindow.C;h=e0e2ce74b1b8dcc56db8e45ea9ae4e94cc20cbde;hb=9d8694b7d2e0f4202e025eaf78d096340184b4e6;hp=679dacade9c8d723e6279b1cb267ed12a96219db;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/gwindow.C b/cinelerra-5.1/cinelerra/gwindow.C
index 679dacad..e0e2ce74 100644
--- a/cinelerra-5.1/cinelerra/gwindow.C
+++ b/cinelerra-5.1/cinelerra/gwindow.C
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #include "gwindow.h"
@@ -33,9 +33,9 @@ GWindow::GWindow(MWindow *mwindow)
 GWindow::~GWindow()
 {
 	if(gui && running()) {
-		gui->set_done(0);
-		join();
+		gui->set_done(1);
 	}
+	join();
 	delete gui;  gui = 0;
 }
 
@@ -51,6 +51,7 @@ void GWindow::create_objects()
 
 	GWindowGUI::calculate_extents(mwindow->gui, &w, &h);
 	gui = new GWindowGUI(mwindow, w, h);
+	gui->load_defaults();
 	gui->create_objects();
 }