X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexception_store.h;h=d1c914c49e36bc6f311dd94a476d6061ad45c31c;hb=3799e91d126d243d41c44dcb0ca1bfa66b53a57e;hp=d7c34c0f438aab04c76b3ebb1de14d50ed83454c;hpb=1ad291db7e847fbb71e5bd9f2f81db6bfb2a022e;p=dcpomatic.git

diff --git a/src/lib/exception_store.h b/src/lib/exception_store.h
index d7c34c0f4..d1c914c49 100644
--- a/src/lib/exception_store.h
+++ b/src/lib/exception_store.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2014 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/>.
 
 */
 
@@ -46,7 +47,7 @@ class ExceptionStore
 {
 public:
 	void rethrow () {
-		boost::mutex::scoped_lock lm (_mutex);
+		boost::mutex::scoped_lock lm (_exception_mutex);
 		if (_exception) {
 			boost::exception_ptr tmp = _exception;
 			_exception = boost::exception_ptr ();
@@ -57,13 +58,13 @@ public:
 protected:
 
 	void store_current () {
-		boost::mutex::scoped_lock lm (_mutex);
+		boost::mutex::scoped_lock lm (_exception_mutex);
 		_exception = boost::current_exception ();
 	}
 
 private:
 	boost::exception_ptr _exception;
-	mutable boost::mutex _mutex;
+	mutable boost::mutex _exception_mutex;
 };
 
 #endif