X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=f53dc4d65e587fd1493d423da837ba7928880cac;hb=b353ad3a849cea55d23b01ae3cdc275b1e631b05;hp=adb7a87aaa868e746eb879ab5bda531c2fa6a459;hpb=50a589b1decdd353a984d8a710e064ebaf8b4f7b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index adb7a87a..f53dc4d6 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -1407,29 +1407,13 @@ SET_TRACE
 				}
 
 // Test existing EDLs
-				if(result)
-				{
-					for(int j = 0; j < new_edls.total + 1; j++)
-					{
-						Asset *old_asset;
-						if(j == new_edls.total)
-						{
-							old_asset = edl->assets->get_asset(new_asset->path);
-							if( old_asset )
-							{
-								*new_asset = *old_asset;
-								result = 0;
-							}
-						}
-						else
-						{
-							old_asset = new_edls[j]->assets->get_asset(new_asset->path);
-							if( old_asset )
-							{
-								*new_asset = *old_asset;
-								result = 0;
-							}
-						}
+				for(int j = 0; result && j <= new_edls.total; j++) {
+					Asset *old_asset = j < new_edls.total ?
+						new_edls[j]->assets->get_asset(new_asset->path) :
+						edl->assets->get_asset(new_asset->path);
+					if( old_asset ) {
+						*new_asset = *old_asset;
+						result = 0;
 					}
 				}
 
@@ -3213,6 +3197,7 @@ int MWindow::run_script(FileXML *script)
 
 int MWindow::interrupt_indexes()
 {
+	mainprogress->cancelled = 1;
 	mainindexes->interrupt_build();
 	return 0;
 }
@@ -3528,7 +3513,7 @@ int MWindow::select_asset(int vtrack, int delete_tracks)
 	if( !edit ) return 1;
 	Asset *asset = edit->asset;
 	if( !asset || !asset->is_asset ) return 1;
-	return select_asset(asset, edit->channel, -1, delete_tracks);
+	return select_asset(asset, edit->channel, 0, delete_tracks);
 }
 
 void MWindow::dump_plugindb(FILE *fp)