colorpick rework, color popup for titler, color convert fixes

[goodguy/history.git] / cinelerra-5.1 / guicast / bcwindowbase.C

diff --git a/cinelerra-5.1/guicast/bcwindowbase.C b/cinelerra-5.1/guicast/bcwindowbase.C
index 791aa0c856ccfb84252f3f9dced1afd7c0c70ea5..d7761f9501202a9b8aba39630e7a70e62c26e2c2 100644 (file)
--- a/cinelerra-5.1/guicast/bcwindowbase.C
+++ b/cinelerra-5.1/guicast/bcwindowbase.C
@@ -3543,13 +3543,21 @@ int BC_WindowBase::deactivate()
 {
        if(window_type == MAIN_WINDOW)
        {
-               if(top_level->active_menubar) top_level->active_menubar->deactivate();
-               if(top_level->active_popup_menu) top_level->active_popup_menu->deactivate();
-               if(top_level->active_subwindow) top_level->active_subwindow->deactivate();
+               if( top_level->active_menubar ) {
+                       top_level->active_menubar->deactivate();
+                       top_level->active_menubar = 0;
+               }
+               if( top_level->active_popup_menu ) {
+                       top_level->active_popup_menu->deactivate();
+                       top_level->active_popup_menu = 0;
+               }
+               if( top_level->active_subwindow ) {
+                       top_level->active_subwindow->deactivate();
+                       top_level->active_subwindow = 0;
+               }
+               if( top_level->motion_events && top_level->last_motion_win == this->win )
+                       top_level->motion_events = 0;
 
-               top_level->active_menubar = 0;
-               top_level->active_popup_menu = 0;
-               top_level->active_subwindow = 0;
        }
        return 0;
 }