X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=0661591a4c82374f6e985e6b5f004058109220af;hp=09747382f32777e885377167b721780ed43d1ae3;hb=9668279ccef86a9cc9138aaa1a659f158698f829;hpb=bdd6708750aa8b8315e9f4456504903f5f368807

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 09747382..0661591a 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -361,7 +361,6 @@ MWindow::~MWindow()
 	colormodels.remove_all_objects();
 	interlace_project_modes.remove_all_objects();
 	interlace_asset_modes.remove_all_objects();
-	interlace_asset_fixmethods.remove_all_objects();
 	sighandler->terminate();
 	delete sighandler;
 	delete run_lock;
@@ -1531,9 +1530,6 @@ void MWindow::init_menus()
 #define ILACEASSETMODELISTADD(x) ilacemode_to_text(string, x); \
                            interlace_asset_modes.append(new InterlacemodeItem(string, x));
 
-#define ILACEFIXMETHODLISTADD(x) ilacefixmethod_to_text(string, x); \
-                           interlace_asset_fixmethods.append(new InterlacefixmethodItem(string, x));
-
 	// Interlacing Modes
 	ILACEASSETMODELISTADD(ILACE_MODE_UNDETECTED); // Not included in the list for the project options.
 
@@ -1546,11 +1542,6 @@ void MWindow::init_menus()
 	ILACEASSETMODELISTADD(ILACE_MODE_NOTINTERLACED);
 	ILACEPROJECTMODELISTADD(ILACE_MODE_NOTINTERLACED);
 
-	// Interlacing Fixing Methods
-	ILACEFIXMETHODLISTADD(ILACE_FIXMETHOD_NONE);
-	ILACEFIXMETHODLISTADD(ILACE_FIXMETHOD_UPONE);
-	ILACEFIXMETHODLISTADD(ILACE_FIXMETHOD_DOWNONE);
-
 	mixers_align = new MixersAlign(this);
 }
 
@@ -2718,7 +2709,9 @@ void MWindow::create_objects(int want_gui,
 	gui->show_window();
 	gui->raise_window();
 	gui->unlock_window();
-
+	cwindow->gui->lock_window("MWindow::create_objects 1");
+	cwindow->gui->tool_panel->raise_tool();
+	cwindow->gui->unlock_window();
 	if(debug) PRINT_TRACE
 
 	if(preferences->use_tipwindow)
@@ -3673,6 +3666,9 @@ void MWindow::update_project(int load_mode)
 	if(debug) PRINT_TRACE
 	cwindow->gui->lock_window("MWindow::update_project 2");
 	cwindow->gui->timebar->update(0);
+	Track *track = cwindow->calculate_affected_track();
+	cwindow->mask_track_id = track ? track->get_id() : -1;
+	cwindow->gui->tool_panel->raise_tool();
 	cwindow->gui->unlock_window();
 
 	if(debug) PRINT_TRACE