X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=7a1f59be404620794446f1b04d478ac996bb23e5;hb=8d1431081df60da0719db2c77e4c56830521c7e8;hp=2c0ddff46de8ebc2c648ea7296982172cc6268aa;hpb=7b05ad287956f8bd00836d9b5fb39f899a5fb641;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 2c0ddff4..7a1f59be 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -2566,12 +2566,11 @@ SET_TRACE
 SET_TRACE
 
 //printf("MWindow::show_plugin 1\n");
-	if(!done)
-	{
-		if(!plugin->track)
-		{
-			printf("MWindow::show_plugin track not defined.\n");
-		}
+	if( !done && !plugin->track ) {
+		printf("MWindow::show_plugin track not defined.\n");
+		done = 1;
+	}
+	if( !done ) {
 		PluginServer *server = scan_plugindb(plugin->title,
 			plugin->track->data_type);
 
@@ -2958,6 +2957,8 @@ void MWindow::update_project(int load_mode)
 	if(load_mode == LOADMODE_REPLACE ||
 		load_mode == LOADMODE_REPLACE_CONCATENATE)
 	{
+		edl->session->proxy_scale = 1;
+		edl->session->proxy_use_scaler = 0;
 		gui->load_panes();
 	}
 
@@ -3615,7 +3616,8 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 	int result = file->open_file(preferences, asset, 1, 0);
 	if( !result && delete_tracks > 0 )
 		undo->update_undo_before();
-	if( !result && asset->video_data && asset->get_video_layers() > 0 ) {
+	int video_layers = asset->get_video_layers();
+	if( !result && asset->video_data && vstream < video_layers ) {
 		// try to get asset up to date, may fail
 		file->select_video_stream(asset, vstream);
 		// either way use what was/is there.
@@ -3671,7 +3673,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 	if( !result && asset->audio_data && asset->channels > 0 ) {
 		session->sample_rate = asset->get_sample_rate();
 		int64_t channel_mask = 0;
-		int astrm = !asset->video_data ? -1 :
+		int astrm = !asset->video_data || vstream >= video_layers ? -1 :
 			file->get_audio_for_video(vstream, astream, channel_mask);
 		if( astrm >= 0 ) file->select_audio_stream(asset, astrm);
 		if( astrm < 0 || !channel_mask ) channel_mask = (1<<asset->channels)-1;