X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fgwindowgui.C;fp=cinelerra-5.1%2Fcinelerra%2Fgwindowgui.C;h=d237fc492d272a9f5bfa186e7918f37f0a1a20e8;hb=09c2f5f26f06b33101230e42cdb0a482a6cccf76;hp=306bc2ac49e8133322f790b0ede77666d7a01247;hpb=fd7da506ec769c911c35264b49bff28f408a02f9;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/gwindowgui.C b/cinelerra-5.1/cinelerra/gwindowgui.C index 306bc2ac..d237fc49 100644 --- a/cinelerra-5.1/cinelerra/gwindowgui.C +++ b/cinelerra-5.1/cinelerra/gwindowgui.C @@ -424,10 +424,15 @@ void GWindowGUI::create_objects() unlock_window(); } -void GWindowGUI::update_mwindow() +void GWindowGUI::update_mwindow(int toggles, int overlays) { unlock_window(); - mwindow->gui->mainmenu->update_toggles(1); + mwindow->gui->lock_window("GWindowGUI::update_mwindow"); + if( toggles ) + mwindow->gui->mainmenu->update_toggles(0); + if( overlays ) + mwindow->gui->draw_overlays(1); + mwindow->gui->unlock_window(); lock_window("GWindowGUI::update_mwindow"); } @@ -451,7 +456,7 @@ void GWindowGUI::toggle_camera_xyz() camera_xyz->set_value(v); xyz_check(AUTOMATION_CAMERA_X, v); update_toggles(0); - update_mwindow(); + update_mwindow(1, 1); } void GWindowGUI::toggle_projector_xyz() @@ -460,7 +465,7 @@ void GWindowGUI::toggle_projector_xyz() projector_xyz->set_value(v); xyz_check(AUTOMATION_PROJECTOR_X, v); update_toggles(0); - update_mwindow(); + update_mwindow(1, 1); } int GWindowGUI::translation_event() @@ -587,7 +592,7 @@ int GWindowToggle::handle_event() gui->update_toggles(0); } } - gui->update_mwindow(); + gui->update_mwindow(1, 0); // Update stuff in MWindow unlock_window();