Fix failure to analyse audio in some cases.

[dcpomatic.git] / src / lib / job_manager.cc

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 545fd956c11548bdc409525c93d8bce5454b0fe3..c9924d226426c0da60d358d9b362fcd6f4d356f4 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -62,7 +63,12 @@ JobManager::~JobManager ()
        }
 
        if (_scheduler) {
-               _scheduler->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(_scheduler->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (_scheduler->joinable ()) {
+                       _scheduler->join ();
+               }
        }
 
        delete _scheduler;