change thread join strategy, fix a few leaks, fix a few bugs

[goodguy/history.git] / cinelerra-5.1 / cinelerra / fileffmpeg.C

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index ab856af041b7a9c0f1769fcffa5af8aa17319e85..660f750edd143038741c7dda5cfdd01678f1a79b 100644 (file)
--- 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();
        if( ff->scan(index_state, &scan_position, &canceled) || canceled ) {
                index_state->reset_index();
                index_state->reset_markers();

-               return 1;
+               canceled = 1;

        }
 
        delete scan_progress;
        }
 
        delete scan_progress;

+       if( canceled ) return 1;
+

        index_state->marker_status = MARKERS_READY;
        return index_state->create_index(index_path, asset);
 }
        index_state->marker_status = MARKERS_READY;
        return index_state->create_index(index_path, asset);
 }