X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=09747382f32777e885377167b721780ed43d1ae3;hb=9c8644d5f3f05b52a81c259c32217bcd57792ae5;hp=66b37fa922be50e2c4c168ad7422fe9f7d262c19;hpb=aa9374b902768107ebda0cffe739325ffed372f6;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 66b37fa9..09747382 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -1182,8 +1182,12 @@ ZWindow *MWindow::get_mixer(Mixer *&mixer)
 	zwindows_lock->lock("MWindow::get_mixer");
 	if( !mixer ) mixer = edl->mixers.new_mixer();
 	ZWindow *zwindow = 0;
-	for( int i=0; !zwindow && i<zwindows.size(); ++i )
-		if( zwindows[i]->idx < 0 ) zwindow = zwindows[i];
+	for( int i=0; !zwindow && i<zwindows.size(); ++i ) {
+		ZWindow *zwdw = zwindows[i];
+		if( zwdw->running() ) continue;
+		if( zwdw->idx >= 0 ) continue;
+		zwindow = zwindows[i];
+	}
 	if( !zwindow )
 		zwindows.append(zwindow = new ZWindow(this));
 	zwindow->idx = mixer->idx;
@@ -1313,6 +1317,7 @@ void MWindow::close_mixers(int destroy)
 	for( int i=zwindows.size(); --i>=0; ) {
 		ZWindow *zwindow = zwindows[i];
 		if( zwindow->idx < 0 ) continue;
+		zwindow->idx = -1;
 		zwindow->destroy = destroy;
 		ZWindowGUI *zgui = zwindow->zgui;
 		zgui->lock_window("MWindow::select_zwindow 0");
@@ -1332,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);
@@ -2194,6 +2199,8 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 		edl->local_session->loop_playback = 0;
 		edl->local_session->set_selectionstart(0);
 		edl->local_session->set_selectionend(0);
+		edl->local_session->unset_inpoint();
+		edl->local_session-> unset_outpoint();
 		set_brender_active(0, 0);
 		fit_selection();
 		goto_start();
@@ -3595,6 +3602,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;
 }
 
@@ -3622,9 +3630,7 @@ void MWindow::update_project(int load_mode)
 	gui->unlock_window();
 	init_brender();
 
-	cwindow->gui->lock_window("MWindow::update_project 1");
 	cwindow->update(0, 0, 1, 1, 1);
-	cwindow->gui->unlock_window();
 
 	if(debug) PRINT_TRACE