X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=25013b43d6e82a9058512cc3912c17555afcea62;hb=0d3917a4eda0344055badf0bd6e235c15c3b6cb8;hp=53b1c17df44370bf9022744ed18223271edc1995;hpb=fd7da506ec769c911c35264b49bff28f408a02f9;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 53b1c17d..25013b43 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"
@@ -2880,12 +2881,6 @@ void MWindow::toggle_loop_playback()
 	sync_parameters(CHANGE_PARAMS);
 }
 
-//void MWindow::set_titles(int value)
-//{
-//	edl->session->show_titles = value;
-//	trackmovement(edl->local_session->track_start);
-//}
-
 void MWindow::set_screens(int value)
 {
 	screens = value;
@@ -3475,12 +3470,14 @@ void MWindow::update_project(int load_mode)
 
 	if(debug) PRINT_TRACE
 	edl->tracks->update_y_pixels(theme);
+	session->update_clip_number();
 
 	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();
 	}
 
@@ -3644,6 +3641,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);