X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=15b29e5c4ce1d06b5b1bfbd89e34bf89f69e0df0;hb=faa186cf5be3aebd789797fb7be051af1d7b5ba1;hp=a9e813af4131a8f9aaf61f1b23b190d3696ce967;hpb=29cc4023b50d6f7f9ab518978d8c9e839832b900;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index a9e813af..15b29e5c 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -106,6 +106,7 @@
 #include "transition.h"
 #include "transportque.h"
 #include "vframe.h"
+#include "versioninfo.h"
 #include "videodevice.inc"
 #include "videowindow.h"
 #include "vplayback.h"
@@ -213,6 +214,7 @@ MWindow::MWindow()
 	restart_status = 0;
 	screens = 1;
 	in_destructor = 0;
+	warn_version = 1;
 }
 
 
@@ -235,6 +237,7 @@ MWindow::~MWindow()
 	delete create_bd;       create_bd = 0;
 	delete create_dvd;      create_dvd = 0;
 	delete batch_render;    batch_render = 0;
+	delete render;          render = 0;
 	commit_commercial();
 	if( commercials && !commercials->remove_user() ) commercials = 0;
 
@@ -292,15 +295,13 @@ MWindow::~MWindow()
 	finit_error();
 	keyframe_threads->remove_all_objects();
 	colormodels.remove_all_objects();
-	delete gui;		gui = 0;
-	delete render;          render = 0;
 	delete awindow;         awindow = 0;
 	delete lwindow;         lwindow = 0;
 	delete twindow;         twindow = 0;
 	delete wwindow;         wwindow = 0;
 	delete gwindow;         gwindow = 0;
-	// must be last or nouveau chokes
 	delete cwindow;         cwindow = 0;
+	delete gui;		gui = 0;
 	//delete file_server;  file_server = 0; // reusable
 	delete mainindexes;     mainindexes = 0;
 	delete mainprogress;    mainprogress = 0;
@@ -340,8 +341,8 @@ MWindow::~MWindow()
 
 void MWindow::quit(int unlock)
 {
-	stop_playback(1);
 	if(unlock) gui->unlock_window();
+	stop_playback(1);
 
 	brender_lock->lock("MWindow::quit");
 	delete brender;         brender = 0;
@@ -1500,7 +1501,29 @@ SET_TRACE
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 				xml_file.read_from_file(filenames->get(i));
 if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
-
+				const char *cin_version = 0;
+				while( !xml_file.read_tag() ) {
+					if( xml_file.tag.title_is("EDL") ) {
+						cin_version = xml_file.tag.get_property("VERSION");
+						break;
+					}
+				}
+				xml_file.rewind();
+				if( !cin_version ) {
+					eprintf(_("XML file %s\n not from cinelerra."),filenames->get(i));
+					char string[BCTEXTLEN];
+					sprintf(string,_("Unknown %s"), filenames->get(i));
+					gui->show_message(string);
+					result = 1;
+					break;
+				}
+				if( strcmp(cin_version, CINELERRA_VERSION) ) {
+					char string[BCTEXTLEN];
+					snprintf(string, sizeof(string),
+						 _("Warning: XML from cinelerra version %s\n"
+						"Session data may be incompatible."), cin_version);
+					show_warning(&preferences->warn_version, string);
+				}
 				if(load_mode == LOADMODE_NESTED)
 				{
 // Load temporary EDL for nesting.
@@ -2438,7 +2461,7 @@ void MWindow::hide_plugin(Plugin *plugin, int lock)
 			ptr->hide_gui();
 			delete_plugin(ptr);
 //sleep(1);
-//			return;
+			return;
 		}
 	}
 	if(lock) plugin_gui_lock->unlock();