X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowbase.C;h=21d6bd37996741580e34057762c763d6066b3010;hb=258b919564933c544cc13c01060f44177a6aff91;hp=583caac6d890e62de81dc16def9db3201a74e6a1;hpb=6c5258a9791775f706e55c280da75ed6f6ef1720;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 583caac6..21d6bd37 100644
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -149,7 +149,11 @@ BC_WindowBase::~BC_WindowBase()
 //printf("delete glx=%08x, win=%08x %s\n", (unsigned)glx_win, (unsigned)win, title);
 #ifdef HAVE_GL
 	if( get_resources()->get_synchronous() && glx_win != 0 ) {
+		if( window_type == MAIN_WINDOW )
+			unlock_window();
 		get_resources()->get_synchronous()->delete_window(this);
+		if( window_type == MAIN_WINDOW )
+			lock_window("BC_WindowBase::delete_window");
 	}
 #endif
 	XDestroyWindow(top_level->display, win);
@@ -728,9 +732,8 @@ int BC_WindowBase::run_window()
 	init_lock->unlock();
 
 // Handle common events
-	while(!done)
-	{
-		dispatch_event(0);
+	while( !done ) {
+		dispatch_event();
 	}
 
 	unset_all_repeaters();
@@ -886,13 +889,14 @@ pthread_t locking_task = (pthread_t)-1L;
 int locking_event = -1;
 int locking_message = -1;
 
-int BC_WindowBase::dispatch_event(XEvent *event)
+int BC_WindowBase::dispatch_event()
 {
 	Window tempwin;
 	int result;
 	XClientMessageEvent *ptr;
 	int cancel_resize, cancel_translation;
 	volatile static int debug = 0;
+	XEvent *event;
 
 	key_pressed = 0;