X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainundo.C;h=dd06f3cd7352227394ce0f7f3a3ea99422e2633d;hb=d3136bf5076921bddf85277f619eeffcf8eb3009;hp=520bc2ee729a876e5c7b68c4b3213c409fb45ad3;hpb=3cbe62ca61e2b35d3e228978f6cdedd11218077f;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mainundo.C b/cinelerra-5.1/cinelerra/mainundo.C
index 520bc2ee..dd06f3cd 100644
--- a/cinelerra-5.1/cinelerra/mainundo.C
+++ b/cinelerra-5.1/cinelerra/mainundo.C
@@ -25,6 +25,7 @@
 #include "clipedls.h"
 #include "edl.h"
 #include "filexml.h"
+#include "indexfile.h"
 #include "mainindexes.h"
 #include "mainmenu.h"
 #include "mainsession.h"
@@ -261,17 +262,25 @@ int MainUndo::load_from_undo(FileXML *file, uint32_t load_flags)
 		mwindow->close_mixers();
 		mwindow->gui->lock_window("MainUndo::load_from_undo");
 	}
-	if( (load_flags & LOAD_ALL) == LOAD_ALL ) {
-		mwindow->edl->remove_user();
+	EDL *prev_edl = mwindow->edl;
+	if( (load_flags & LOAD_ALL) == LOAD_ALL )
 		mwindow->init_edl();
-	}
 	mwindow->edl->load_xml(file, load_flags);
 	for( Asset *asset=mwindow->edl->assets->first; asset; asset=asset->next ) {
 		mwindow->mainindexes->add_indexable(asset);
 	}
-	for( int i=0; i<mwindow->edl->nested_edls.size(); ++i ) {
-		EDL *nested_edl = mwindow->edl->nested_edls[i];
-		mwindow->mainindexes->add_indexable(nested_edl);
+	if( prev_edl != mwindow->edl ) {
+		for( int i=0; i<mwindow->edl->nested_edls.size(); ++i ) {
+			EDL *nested_edl = mwindow->edl->nested_edls[i];
+			if( !nested_edl->path[0] ) continue;
+			int k = prev_edl->nested_edls.size();
+			while( --k >= 0 && // if nested edl was updated, force index rebuild
+				strcmp(nested_edl->path, prev_edl->nested_edls[k]->path) );
+			if( k >= 0 && prev_edl->nested_edls[k]->equivalent_output(nested_edl) >= 0 )
+				IndexFile::delete_index_files(mwindow->preferences, nested_edl);
+			mwindow->mainindexes->add_indexable(nested_edl);
+		}
+		prev_edl->remove_user();
 	}
 	mwindow->mainindexes->start_build();
 	mwindow->update_plugin_guis(1);