Fix some coverity-reported stuff.

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

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 8be468b306332de52aa15511c606680201c7abc1..8dc4de50ef278dc66a02b9964a9fd146607086a9 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -20,6 +20,7 @@
 #include <string>
 #include <iostream>
 #include <cstdlib>
+#include <stdexcept>
 #include <getopt.h>
 #include <boost/filesystem.hpp>
 #include "lib/version.h"
@@ -34,6 +35,7 @@ using std::string;
 using std::cout;
 using std::cerr;
 using std::list;
+using std::exception;
 using boost::shared_ptr;
 
 static void
@@ -98,31 +100,37 @@ main (int argc, char* argv[])
        dcpomatic_setup ();
        ui_signaller = new UISignaller ();
 
-       shared_ptr<Film> film (new Film (output));
-       if (!name.empty ()) {
-               film->set_name (name);
-       }
-
-       for (int i = optind; i < argc; ++i) {
-               film->examine_and_add_content (content_factory (film, argv[i]));
-       }
-
-       JobManager* jm = JobManager::instance ();
-       while (jm->work_to_do ()) {
-               ui_signaller->ui_idle ();
-       }
-
-       if (jm->errors ()) {
-               list<shared_ptr<Job> > jobs = jm->get ();
-               for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
-                       if ((*i)->finished_in_error ()) {
-                               cerr << (*i)->error_summary () << "\n"
-                                    << (*i)->error_details () << "\n";
+       try {
+               shared_ptr<Film> film (new Film (output));
+               if (!name.empty ()) {
+                       film->set_name (name);
+               }
+               
+               for (int i = optind; i < argc; ++i) {
+                       film->examine_and_add_content (content_factory (film, argv[i]));
+               }
+               
+               JobManager* jm = JobManager::instance ();
+               while (jm->work_to_do ()) {
+                       ui_signaller->ui_idle ();
+               }
+               
+               if (jm->errors ()) {
+                       list<shared_ptr<Job> > jobs = jm->get ();
+                       for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
+                               if ((*i)->finished_in_error ()) {
+                                       cerr << (*i)->error_summary () << "\n"
+                                            << (*i)->error_details () << "\n";
+                               }
                        }
+                       exit (EXIT_FAILURE);
                }
+               
+               film->write_metadata ();
+       } catch (exception& e) {
+               cerr << argv[0] << ": " << e.what() << "\n";
                exit (EXIT_FAILURE);
        }
-
-       film->write_metadata ();
+               
        return 0;
 }