Fix use-after-free (although in quickmail code which I don't think is called).

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

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 1a05ed2cbf8876203d682f0e26d462e35d87b664..e929f185d1fa75e4339d4dbaff7f92dbf943f5b8 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -36,7 +36,6 @@
 #include "wx/film_editor.h"
 #include "wx/job_manager_view.h"
 #include "wx/config_dialog.h"
-#include "wx/job_wrapper.h"
 #include "wx/wx_util.h"
 #include "wx/new_film_dialog.h"
 #include "wx/properties_dialog.h"
@@ -62,15 +61,18 @@
 #include <boost/filesystem.hpp>
 #include <iostream>
 #include <fstream>
+#include <sstream>
 
 #ifdef check
 #undef check
 #endif
 
 using std::cout;
+using std::wcout;
 using std::string;
 using std::vector;
 using std::wstring;
+using std::wstringstream;
 using std::map;
 using std::make_pair;
 using std::list;
@@ -399,8 +401,18 @@ private:
                                return;
                        }
                }
-               
-               JobWrapper::make_dcp (this, _film);
+
+               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.
+                       */
+                       _film->write_metadata ();
+                       _film->make_dcp ();
+               } catch (BadSettingError& e) {
+                       error_dialog (this, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx(e.setting()).data(), std_to_wx(e.what()).data()));
+               } catch (std::exception& e) {
+                       error_dialog (this, wxString::Format (_("Could not make DCP: %s"), std_to_wx(e.what()).data()));
+               }
        }
 
        void jobs_make_kdms ()
@@ -457,12 +469,13 @@ private:
 
        void jobs_show_dcp ()
        {
-#ifdef __WXMSW__
-               string d = _film->directory().string ();
-               wstring w;
-               w.assign (d.begin(), d.end());
-               ShellExecute (0, L"open", w.c_str(), 0, 0, SW_SHOWDEFAULT);
-#else
+#ifdef DCPOMATIC_WINDOWS
+               wstringstream args;
+               args << "/select," << _film->dir (_film->dcp_name(false));
+               ShellExecute (0, L"open", L"explorer.exe", args.str().c_str(), 0, SW_SHOWDEFAULT);
+#endif
+
+#ifdef DCPOMATIC_LINUX
                int r = system ("which nautilus");
                if (WEXITSTATUS (r) == 0) {
                        r = system (string ("nautilus " + _film->directory().string()).c_str ());
@@ -479,6 +492,13 @@ private:
                        }
                }
 #endif         
+
+#ifdef DCPOMATIC_OSX
+               int r = system (string ("open -R " + _film->dir (_film->dcp_name (false)).string ()).c_str ());
+               if (WEXITSTATUS (r)) {
+                       error_dialog (this, _("Could not show DCP"));
+               }
+#endif                
        }
 
        void tools_hints ()
@@ -790,7 +810,7 @@ class App : public wxApp
                if (!_film_to_create.empty ()) {
                        _frame->new_film (_film_to_create);
                        if (!_content_to_add.empty ()) {
-                               _frame->film()->examine_and_add_content (content_factory (_frame->film(), _content_to_add), true);
+                               _frame->film()->examine_and_add_content (content_factory (_frame->film(), _content_to_add));
                        }
                }
 
@@ -876,29 +896,19 @@ class App : public wxApp
 
        void update_checker_state_changed ()
        {
-               switch (UpdateChecker::instance()->state ()) {
-               case UpdateChecker::YES:
-               {
-                       string test;
-                       if (Config::instance()->check_for_test_updates ()) {
-                               test = UpdateChecker::instance()->test ();
-                       }
-                       UpdateDialog* dialog = new UpdateDialog (_frame, UpdateChecker::instance()->stable (), test);
+               UpdateChecker* uc = UpdateChecker::instance ();
+               if (uc->state() == UpdateChecker::YES && (uc->stable() || uc->test())) {
+                       UpdateDialog* dialog = new UpdateDialog (_frame, uc->stable (), uc->test ());
                        dialog->ShowModal ();
                        dialog->Destroy ();
-                       break;
-               }
-               case UpdateChecker::NO:
+               } else if (uc->state() == UpdateChecker::FAILED) {
                        if (!UpdateChecker::instance()->last_emit_was_first ()) {
-                               error_dialog (_frame, _("There are no new versions of DCP-o-matic available."));
+                               error_dialog (_frame, _("The DCP-o-matic download server could not be contacted."));
                        }
-                       break;
-               case UpdateChecker::FAILED:
+               } else {
                        if (!UpdateChecker::instance()->last_emit_was_first ()) {
-                               error_dialog (_frame, _("The DCP-o-matic download server could not be contacted."));
+                               error_dialog (_frame, _("There are no new versions of DCP-o-matic available."));
                        }
-               default:
-                       break;
                }
        }