X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainundo.C;fp=cinelerra-5.1%2Fcinelerra%2Fmainundo.C;h=9f69f8eb4754b8064dfc28590a202e24e4b70e62;hp=dd06f3cd7352227394ce0f7f3a3ea99422e2633d;hb=84ac8a2bb3357c04a3f67cf763b0f61ddbbd021d;hpb=2951f82f2d7e8edf91b42f610266fd84919dd5ef

diff --git a/cinelerra-5.1/cinelerra/mainundo.C b/cinelerra-5.1/cinelerra/mainundo.C
index dd06f3cd..9f69f8eb 100644
--- a/cinelerra-5.1/cinelerra/mainundo.C
+++ b/cinelerra-5.1/cinelerra/mainundo.C
@@ -187,7 +187,9 @@ int MainUndo::redo_load_flags()
 
 int MainUndo::undo()
 {
+	mwindow->gui->close_keyvalue_popup();
 	mwindow->undo_commercial();
+
 	UndoStackItem *current = undo_stack->current;
 	if( current ) {
 		undo_stack->current = next_undo();
@@ -225,6 +227,7 @@ int MainUndo::undo()
 
 int MainUndo::redo()
 {
+	mwindow->gui->close_keyvalue_popup();
 	UndoStackItem *current = next_redo();
 	if( current ) {
 		undo_stack->current = current;
@@ -254,9 +257,6 @@ 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();