X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=f9a03d8b09feda2a5f05c8d07d397a04ea2f05e2;hb=25d55759c94adba96336edf6780cee7138c2ec21;hp=ac39d4fedb823ccdf76c83de4f35f5cd04871dfc;hpb=89115db77729a2c99f1a09ff6a461720e16f889e;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index ac39d4fed..f9a03d8b0 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -164,7 +164,13 @@ setup_menu (wxMenuBar* m)
 #ifndef __WXOSX__	
 	file->AppendSeparator ();
 #endif
+
+#ifdef __WXOSX__	
 	add_item (file, _("&Exit"), wxID_EXIT, ALWAYS);
+#else
+	add_item (file, _("&Quit"), wxID_EXIT, ALWAYS);
+#endif	
+	
 
 #ifdef __WXOSX__	
 	add_item (file, _("&Preferences..."), wxID_PREFERENCES, ALWAYS);
@@ -286,7 +292,7 @@ private:
 		
 		if (r == wxID_OK) {
 
-			if (boost::filesystem::exists (d->get_path()) && !boost::filesystem::is_empty(d->get_path())) {
+			if (boost::filesystem::is_directory (d->get_path()) && !boost::filesystem::is_empty(d->get_path())) {
 				if (!confirm_dialog (
 					    this,
 					    std_to_wx (
@@ -297,6 +303,12 @@ private:
 					    )) {
 					return;
 				}
+			} else if (boost::filesystem::is_regular_file (d->get_path())) {
+				error_dialog (
+					this,
+					String::compose (wx_to_std (_("%1 already exists as a file, so you cannot use it for a new film.")), d->get_path().c_str())
+					);
+				return;
 			}
 			
 			maybe_save_then_delete_film ();
@@ -327,6 +339,7 @@ private:
 			maybe_save_then_delete_film ();
 			try {
 				film.reset (new Film (wx_to_std (c->GetPath ())));
+				film->read_metadata ();
 				film->log()->set_level (log_level);
 				set_film ();
 			} catch (std::exception& e) {