projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d5b1891
)
Fix deadlock.
author
Carl Hetherington
<cth@carlh.net>
Sat, 23 May 2015 16:43:33 +0000
(17:43 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 23 May 2015 16:43:33 +0000
(17:43 +0100)
src/lib/job.cc
patch
|
blob
|
history
diff --git
a/src/lib/job.cc
b/src/lib/job.cc
index c4d93ddc14b733b5d913fa1411a3cddf0f76648d..e5d0933f83d7572477a0222972ddb1a80ea3ee38 100644
(file)
--- a/
src/lib/job.cc
+++ b/
src/lib/job.cc
@@
-238,6
+238,9
@@
Job::set_progress (float p, bool force)
_pause_changed.wait (lm2);
}
+ lm.unlock ();
+ lm2.unlock ();
+
emit (boost::bind (boost::ref (Progress)));
}