Catch std::exception, not just KDMError, from KDM creation.

diff --git a/ChangeLog b/ChangeLog
index ba21e4cb570f3cd41be4a355d525187133bae09a..38d9b667e383bc5abcf89ae89a1ca1e64d6a0749 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-11  Carl Hetherington  <cth@carlh.net>
+
+       * Be more careful when catching exceptions from KDM creation.
+
 2014-02-10  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.64.10 released.

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 1e60d96903d3569fe8182e3777c32fd08980f902..70e675e4099f52ea15bc2ff80b0370cb35b6e17b 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -474,8 +474,10 @@ private:
                                        shared_ptr<Job> (new SendKDMEmailJob (film, d->screens (), d->dcp (), d->from (), d->until ()))
                                        );
                        }
-               } catch (KDMError& e) {
+               } catch (exception& e) {
                        error_dialog (this, e.what ());
+               } catch (...) {
+                       error_dialog (this, _("An unknown exeception occurred."));
                }
        
                d->Destroy ();