Try to fix double are-you-sure prompt on closing with active jobs.

diff --git a/ChangeLog b/ChangeLog
index 7b5a548b8a53310d88a19cd1a33bfafac187f5d4..e912c796a2b596027e409e0c0b3e3f6b4155d33e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-10  Carl Hetherington  <cth@carlh.net>
+
+       * Try to fix double "are you sure" prompt on quitting with active jobs.
+
 2014-01-09  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.61.1 released.

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 111b5769d313baa3a226eb8684e2bdbbf395f426..1e60d96903d3569fe8182e3777c32fd08980f902 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -429,11 +429,6 @@ private:
        
        void file_exit ()
        {
-               if (!should_close ()) {
-                       return;
-               }
-               
-               maybe_save_then_delete_film ();
                Close (true);
        }