X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainundo.C;h=0c149cd40acc445d8626a060b7f7cae831ce0e00;hp=9cd3562eba166f9dd1019f9712cd925ce74f8671;hb=7eded24eb31529ad7652dea64e34b0a6210e5be1;hpb=214bd0ba9e21635e03d0c0e2b2ae1a7e9170583c

diff --git a/cinelerra-5.1/cinelerra/mainundo.C b/cinelerra-5.1/cinelerra/mainundo.C
index 9cd3562e..0c149cd4 100644
--- a/cinelerra-5.1/cinelerra/mainundo.C
+++ b/cinelerra-5.1/cinelerra/mainundo.C
@@ -255,11 +255,18 @@ int MainUndo::redo()
 // Here the master EDL loads
 int MainUndo::load_from_undo(FileXML *file, uint32_t load_flags)
 {
+	delete mwindow->gui->keyvalue_popup;
+	mwindow->gui->keyvalue_popup = 0;
+
 	if( load_flags & LOAD_SESSION ) {
 		mwindow->gui->unlock_window();
 		mwindow->close_mixers();
 		mwindow->gui->lock_window("MainUndo::load_from_undo");
 	}
+	if( (load_flags & LOAD_ALL) == LOAD_ALL ) {
+		mwindow->edl->remove_user();
+		mwindow->init_edl();
+	}
 	mwindow->edl->load_xml(file, load_flags);
 	for( Asset *asset=mwindow->edl->assets->first; asset; asset=asset->next ) {
 		mwindow->mainindexes->add_next_asset(0, asset);