Try to fix deadlock.

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 18df40878f8feafae345fa64786be06d51e0ecaf..e63ea6dc8e16776099580cb3740a5b46c7061d0b 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -179,15 +179,21 @@ Job::paused () const
 void
 Job::set_state (State s)
 {
-       boost::mutex::scoped_lock lm (_state_mutex);
-       _state = s;
+       bool finished = false;
+       
+       {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               _state = s;
 
-       if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) {
-               _ran_for = elapsed_time ();
-               if (ui_signaller) {
-                       ui_signaller->emit (boost::bind (boost::ref (Finished)));
+               if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) {
+                       _ran_for = elapsed_time ();
+                       finished = true;
                }
        }
+
+       if (finished && ui_signaller) {
+               ui_signaller->emit (boost::bind (boost::ref (Finished)));
+       }
 }
 
 /** @return Time (in seconds) that this job has been running */