X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=6d4c8fb81ff7a68d81b25f6462c980de6c6d07a2;hb=3932d2c16e903573db3cacdb3102dea9639c6ca4;hp=e6a40ee551bb01059bb985e9a99f17c2b43f71f7;hpb=2e28d225c343f02500594688bf8d0528df40600c;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index e6a40ee5..6d4c8fb8 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -249,6 +249,10 @@ MWindow::~MWindow()
 	run_lock->lock("MWindow::~MWindow");
 	in_destructor = 1;
 //printf("MWindow::~MWindow %d\n", __LINE__);
+	if( wwindow && wwindow->is_running() )
+		wwindow->close_window();
+	if( twindow && twindow->is_running() )
+		twindow->close_window();
 	gui->remote_control->deactivate();
 	gui->record->stop();
 #ifdef HAVE_DVB
@@ -286,16 +290,12 @@ MWindow::~MWindow()
 	if( cwindow && cwindow->gui ) cwindow->gui->close(0);
 	if( lwindow && lwindow->gui ) lwindow->gui->close(0);
 	if( gwindow && gwindow->gui ) gwindow->gui->close(0);
-	if( twindow && twindow->is_running() ) twindow->close_window();
-	if( wwindow && wwindow->is_running() ) wwindow->close_window();
 	vwindows.remove_all_objects();
 	zwindows.remove_all_objects();
 	gui->close(0);
 	if( awindow ) awindow->join();
 	if( cwindow ) cwindow->join();
 	if( lwindow ) lwindow->join();
-	if( twindow ) twindow->join();
-	if( wwindow ) wwindow->join();
 	if( gwindow ) gwindow->join();
 	join();
 #else
@@ -307,8 +307,6 @@ MWindow::~MWindow()
 	close_gui(cwindow);
 	close_gui(lwindow);
 	close_gui(gwindow);
-	close_gui(twindow);
-	close_gui(wwindow);
 	vwindows.remove_all_objects();
 	zwindows.remove_all_objects();
 	gui->close(0);