Cleanup: longer variable name.

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 1923a12a3f4305e964d53e6718ff6e1936680a85..bd5be54aed3b19fe8987fb2ae0975a33be7bca9a 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -74,6 +74,7 @@
 #include "lib/exceptions.h"
 #include "lib/ffmpeg_encoder.h"
 #include "lib/film.h"
+#include "lib/font_config.h"
 #include "lib/hints.h"
 #include "lib/job_manager.h"
 #include "lib/kdm_with_metadata.h"
@@ -614,14 +615,22 @@ private:
 
        void file_save ()
        {
-               _film->write_metadata ();
+               try {
+                       _film->write_metadata ();
+               } catch (exception& e) {
+                       error_dialog(this, _("Could not save project."), std_to_wx(e.what()));
+               }
        }
 
        void file_save_as_template ()
        {
                SaveTemplateDialog dialog(this);
                if (dialog.ShowModal() == wxID_OK) {
-                       Config::instance()->save_template(_film, dialog.name());
+                       try {
+                               Config::instance()->save_template(_film, dialog.name());
+                       } catch (exception& e) {
+                               error_dialog(this, _("Could not save template."), std_to_wx(e.what()));
+                       }
                }
        }
 
@@ -633,7 +642,11 @@ private:
                        auto film = make_shared<Film>(dialog.path());
                        film->copy_from (_film);
                        film->set_name(dialog.path().filename().generic_string());
-                       film->write_metadata ();
+                       try {
+                               film->write_metadata();
+                       } catch (exception& e) {
+                               error_dialog(this, _("Could not duplicate project."), std_to_wx(e.what()));
+                       }
                }
        }
 
@@ -645,8 +658,12 @@ private:
                        auto film = make_shared<Film>(dialog.path());
                        film->copy_from (_film);
                        film->set_name(dialog.path().filename().generic_string());
-                       film->write_metadata ();
-                       set_film (film);
+                       try {
+                               film->write_metadata ();
+                               set_film (film);
+                       } catch (exception& e) {
+                               error_dialog(this, _("Could not duplicate project."), std_to_wx(e.what()));
+                       }
                }
        }
 
@@ -1175,6 +1192,8 @@ private:
                /* Also stop hearing about analytics-related stuff */
                _analytics_message_connection.disconnect ();
 
+               FontConfig::drop();
+
                ev.Skip ();
        }
 
@@ -1251,8 +1270,8 @@ private:
                }
 
                if (_film->dirty ()) {
-                       T d (_film->name ());
-                       switch (d.run ()) {
+                       T dialog(_film->name());
+                       switch (dialog.run()) {
                        case wxID_NO:
                                return true;
                        case wxID_YES: