upgrade ffmpeg to 3.4.2, add proxy popup, undo/redo deadlock fix, rework nested edl

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

diff --git a/cinelerra-5.1/cinelerra/clipedls.C b/cinelerra-5.1/cinelerra/clipedls.C
index 65dd58e2c23fc3b36d038189d3bfff46dd5ada7b..52dd7678ea168d41c7d9cc64ad8e434f7292d226 100644 (file)
--- a/cinelerra-5.1/cinelerra/clipedls.C
+++ b/cinelerra-5.1/cinelerra/clipedls.C
@@ -38,6 +38,10 @@ void ClipEDLs::remove_clip(EDL *clip)
 EDL* ClipEDLs::get_copy(EDL *src)
 {
        if( !src ) return 0;
+       for( int i=0; i<size(); ++i ) {
+               EDL *dst = get(i);
+               if( src == dst || src->id == dst->id ) return dst;
+       }
        for( int i=0; i<size(); ++i ) {
                EDL *dst = get(i);
                if( !strcmp(dst->path, src->path) ) return dst;