X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=7d871c9652126768e7e3d1612aaaaaa23fcde9ec;hp=3213969abbb21afeba816719a41d982a8ab848fa;hb=7eded24eb31529ad7652dea64e34b0a6210e5be1;hpb=95f86161c3b9c422bbd04ec8f685aa7e856d6dd7

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 3213969a..7d871c96 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -2006,7 +2006,8 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 				result = 1;
 				break;
 			}
-			if( strcmp(cin_version, CINELERRA_VERSION) ) {
+			if( strcmp(cin_version, CINELERRA_VERSION) &&
+			    strcmp(cin_version, "5.1") ) {
 				char string[BCTEXTLEN];
 				snprintf(string, sizeof(string),
 					 _("Warning: XML from cinelerra version %s\n"
@@ -3472,9 +3473,10 @@ void MWindow::update_project(int load_mode)
 
 	if(debug) PRINT_TRACE
 
-	if(load_mode == LOADMODE_REPLACE ||
-		load_mode == LOADMODE_REPLACE_CONCATENATE)
-	{
+	if( load_mode == LOADMODE_REPLACE ||
+	    load_mode == LOADMODE_REPLACE_CONCATENATE ) {
+		delete gui->keyvalue_popup;
+		gui->keyvalue_popup = 0;
 		gui->load_panes();
 	}
 
@@ -3638,6 +3640,8 @@ void MWindow::load_backup()
 
 void MWindow::save_undo_data()
 {
+	undo->update_undo_before();
+	undo->update_undo_after(_("perpetual session"), LOAD_ALL);
 	char perpetual_path[BCTEXTLEN];
 	snprintf(perpetual_path, sizeof(perpetual_path), "%s/%s",
 		File::get_config_path(), PERPETUAL_FILE);