X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=27e0917ec7eabe59d3782ee1f8c5973d9e62fd2d;hb=318256a48938064b695268d03396977739ef4724;hp=0d4421e930c2acb9b83e084e93179aa7fca0c9ab;hpb=0d49253b107e67067b6143958fee3f8e4c0e0b6c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 0d4421e9..27e0917e 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -235,6 +235,7 @@ MWindow::~MWindow()
 	delete create_bd;       create_bd = 0;
 	delete create_dvd;      create_dvd = 0;
 	delete batch_render;    batch_render = 0;
+	delete render;          render = 0;
 	commit_commercial();
 	if( commercials && !commercials->remove_user() ) commercials = 0;
 
@@ -292,15 +293,13 @@ MWindow::~MWindow()
 	finit_error();
 	keyframe_threads->remove_all_objects();
 	colormodels.remove_all_objects();
-	delete gui;		gui = 0;
-	delete render;          render = 0;
 	delete awindow;         awindow = 0;
 	delete lwindow;         lwindow = 0;
 	delete twindow;         twindow = 0;
 	delete wwindow;         wwindow = 0;
 	delete gwindow;         gwindow = 0;
-	// must be last or nouveau chokes
 	delete cwindow;         cwindow = 0;
+	delete gui;		gui = 0;
 	//delete file_server;  file_server = 0; // reusable
 	delete mainindexes;     mainindexes = 0;
 	delete mainprogress;    mainprogress = 0;
@@ -340,8 +339,8 @@ MWindow::~MWindow()
 
 void MWindow::quit(int unlock)
 {
-	stop_playback(1);
 	if(unlock) gui->unlock_window();
+	stop_playback(1);
 
 	brender_lock->lock("MWindow::quit");
 	delete brender;         brender = 0;