X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=f94c2ac547209a2118927779d1355723d2d8eb72;hb=988ed4fac88965f2fc260f55a05e2db87bb1ecb8;hp=19e7707182d05b5f293da6c54a4ae86174752de8;hpb=1f726f889fb4e590ec20a8ea8682d14e267ee6f1;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 19e770718..f94c2ac54 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -215,8 +215,8 @@ public:
 		SetIcon (wxIcon (std_to_wx ("id")));
 #endif
 
-		_config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this));
-		config_changed ();
+		_config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1));
+		config_changed (Config::OTHER);
 
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_new, this),                ID_file_new);
 		Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_open, this),               ID_file_open);
@@ -278,9 +278,6 @@ public:
 		wxAcceleratorTable accel_table (2, accel);
 		SetAcceleratorTable (accel_table);
 
-		/* Instantly save any config changes when using the DCP-o-matic GUI */
-		Config::instance()->Changed.connect (boost::bind (&Config::write, Config::instance ()));
-
 		UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this));
 	}
 
@@ -499,6 +496,16 @@ private:
 			}
 		}
 
+
+		/* Remove any existing DCP if the user agrees */
+		boost::filesystem::path const dcp_dir = _film->dir (_film->dcp_name(), false);
+		if (boost::filesystem::exists (dcp_dir)) {
+			if (!confirm_dialog (this, wxString::Format (_("Do you want to overwrite the existing DCP %s?"), std_to_wx(dcp_dir.string()).data()))) {
+				return;
+			}
+			boost::filesystem::remove_all (dcp_dir);
+		}
+
 		try {
 			/* It seems to make sense to auto-save metadata here, since the make DCP may last
 			   a long time, and crashes/power failures are moderately likely.
@@ -926,8 +933,35 @@ private:
 		m->Append (help, _("&Help"));
 	}
 
-	void config_changed ()
+	void config_changed (Config::Property what)
 	{
+		/* Instantly save any config changes when using the DCP-o-matic GUI */
+		if (what == Config::CINEMAS) {
+			try {
+				Config::instance()->write_cinemas();
+			} catch (exception& e) {
+				error_dialog (
+					this,
+					wxString::Format (
+						_("Could not write to cinemas file at %s.  Your changes have not been saved."),
+						std_to_wx (Config::instance()->cinemas_file().string()).data()
+						)
+					);
+			}
+		} else {
+			try {
+				Config::instance()->write_config();
+			} catch (exception& e) {
+				error_dialog (
+					this,
+					wxString::Format (
+						_("Could not write to config file at %s.  Your changes have not been saved."),
+						std_to_wx (Config::instance()->cinemas_file().string()).data()
+						)
+					);
+			}
+		}
+
 		for (int i = 0; i < _history_items; ++i) {
 			delete _file_menu->Remove (ID_file_history + i);
 		}