projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
exceptions.h
diff --git
a/src/lib/exceptions.h
b/src/lib/exceptions.h
index 52f257a8d3f558550ccba9724dfe612e3eca55c0..90a0abfc717d46cfa697b92fef0dccba62795620 100644
(file)
--- a/
src/lib/exceptions.h
+++ b/
src/lib/exceptions.h
@@
-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);
}
}