projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for join strategy change
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mwindow.C
diff --git
a/cinelerra-5.1/cinelerra/mwindow.C
b/cinelerra-5.1/cinelerra/mwindow.C
index 381b0c1afe7c0d1486f8523b7f79a40bbc7174d4..f53dc4d65e587fd1493d423da837ba7928880cac 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.C
+++ b/
cinelerra-5.1/cinelerra/mwindow.C
@@
-3197,6
+3197,7
@@
int MWindow::run_script(FileXML *script)
int MWindow::interrupt_indexes()
{
int MWindow::interrupt_indexes()
{
+ mainprogress->cancelled = 1;
mainindexes->interrupt_build();
return 0;
}
mainindexes->interrupt_build();
return 0;
}
@@
-3512,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;
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)
}
void MWindow::dump_plugindb(FILE *fp)