X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=660f750edd143038741c7dda5cfdd01678f1a79b;hp=ab856af041b7a9c0f1769fcffa5af8aa17319e85;hb=3ec3a9cc6afc6561311686b3ec597ee3c1d80d6f;hpb=788dfe4aae1aef521caddcc68dec7369a996dce7

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index ab856af0..660f750e 100644
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -668,10 +668,12 @@ int FileFFMPEG::get_index(IndexFile *index_file, MainProgressBar *progress_bar)
 	if( ff->scan(index_state, &scan_position, &canceled) || canceled ) {
 		index_state->reset_index();
 		index_state->reset_markers();
-		return 1;
+		canceled = 1;
 	}
 
 	delete scan_progress;
+	if( canceled ) return 1;
+
 	index_state->marker_status = MARKERS_READY;
 	return index_state->create_index(index_path, asset);
 }