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

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ba21e4cb5..38d9b667e 100644
--- 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 1e60d9690..70e675e40 100644
--- 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 ();