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=14268e1d37709f5d0b57e17cb4b89c919c53450d;hb=7eded24eb31529ad7652dea64e34b0a6210e5be1;hpb=6c533a5098aa5a5ca85b97dd405bb06b26033a91

diff --git a/cinelerra-5.1/cinelerra/mainundo.C b/cinelerra-5.1/cinelerra/mainundo.C
index 14268e1d..0c149cd4 100644
--- a/cinelerra-5.1/cinelerra/mainundo.C
+++ b/cinelerra-5.1/cinelerra/mainundo.C
@@ -255,16 +255,17 @@ 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 ) {
-		EDL *edl = new EDL;
-		edl->create_objects();
 		mwindow->edl->remove_user();
-		mwindow->edl = edl;
+		mwindow->init_edl();
 	}
 	mwindow->edl->load_xml(file, load_flags);
 	for( Asset *asset=mwindow->edl->assets->first; asset; asset=asset->next ) {