X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fexceptions.h;h=05c66df3a66e57bc2ed3c236b1f6e637bdfd81ee;hb=09d7c1aeab76040e1dcbd829fbf734c4f4706180;hp=52f257a8d3f558550ccba9724dfe612e3eca55c0;hpb=6de35d058821acc092d2aae75543024a97026b8a;p=dcpomatic.git

diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 52f257a8d..05c66df3a 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -24,14 +24,14 @@
 #ifndef DCPOMATIC_EXCEPTIONS_H
 #define DCPOMATIC_EXCEPTIONS_H
 
-#include <stdexcept>
-#include <cstring>
-#include <boost/exception/all.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/thread.hpp>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
+#include <boost/exception/all.hpp>
+#include <boost/filesystem.hpp>
+#include <stdexcept>
+#include <cstring>
 
 /** @class StringError
  *  @brief A parent class for exceptions using messages held in a std::string
@@ -284,8 +284,9 @@ public:
 	void rethrow () {
 		boost::mutex::scoped_lock lm (_mutex);
 		if (_exception) {
-			boost::rethrow_exception (_exception);
+			boost::exception_ptr tmp = _exception;
 			_exception = boost::exception_ptr ();
+			boost::rethrow_exception (tmp);
 		}
 	}