X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=323243afca9985b714a92232f1a9b862068e334e;hb=505506bd554eff241bd0a5b5b84c220cb2c59971;hp=d563ca69d803faf141387cfd11323fb18c06343c;hpb=017728ea68874203d45b3f16050626d540608e35;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index d563ca69..323243af 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -1337,7 +1337,7 @@ ZWindow *MWindow::create_mixer(Indexable *indexable, double position)
 	ArrayList<Indexable*> new_assets;
 	new_assets.append(indexable);
 	Track *track = edl->tracks->last;
-	load_assets(&new_assets, position, LOADMODE_NEW_TRACKS, 0, 0, 0, 0, 0, 0);
+	load_assets(&new_assets, position, LOADMODE_NEW_TRACKS, 0, 0, 0, 0, 0, 1);
 	track = !track ? edl->tracks->first : track->next;
 	Mixer *mixer = 0;
 	ZWindow *zwindow = get_mixer(mixer);
@@ -2718,7 +2718,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)
@@ -3602,6 +3604,7 @@ if(debug) printf("MWindow::asset_to_edl %d\n", __LINE__);
 //printf("MWindow::asset_to_edl 4 %s\n", string);
 if(debug) printf("MWindow::asset_to_edl %d\n", __LINE__);
 
+	new_edl->local_session->asset2edl = 1;
 	return 0;
 }
 
@@ -3672,6 +3675,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