From: Good Guy <good1.2guy@gmail.com>
Date: Tue, 25 Sep 2018 16:29:01 +0000 (-0600)
Subject: fix shf-f1/f2 toggle timeline update
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=09c2f5f26f06b33101230e42cdb0a482a6cccf76;p=goodguy%2Fhistory.git

fix shf-f1/f2 toggle timeline update
---

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();
diff --git a/cinelerra-5.1/cinelerra/gwindowgui.h b/cinelerra-5.1/cinelerra/gwindowgui.h
index bde6fa7d..3b47b958 100644
--- a/cinelerra-5.1/cinelerra/gwindowgui.h
+++ b/cinelerra-5.1/cinelerra/gwindowgui.h
@@ -60,7 +60,7 @@ public:
 	void update_toggles(int use_lock);
 	void toggle_camera_xyz();
 	void toggle_projector_xyz();
-	void update_mwindow();
+	void update_mwindow(int toggles, int overlays);
 	void load_defaults();
 	void save_defaults();
 	int *get_main_value(toggleinfo *info);