Changeset 6cbdac

Timestamp:

02/02/12 12:35:08 (4 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')

Children:

f62881d42e171b9d38911d42e2e2239cf4b08d55

Parents:

91cf55816c082f625d54a715647067388cf818af

git-author:

Stefan Persson <stefan.persson@telldus.se>2012-02-02 12:35:08+01:00

git-committer:

Stefan Persson <stefan.persson@telldus.se>2012-02-02 12:35:08+01:00

Message:

Fixed TelldusCenter freeze when saving device changes in Linux/Mac

File:

• telldus-core/client/CallbackDispatcher.cpp (modified) (8 diffs)

telldus-core/client/CallbackDispatcher.cpp

@@ -22 +22 @@
 TDDeviceEventDispatcher::~TDDeviceEventDispatcher() {
         this->wait();
-        d->mutex.unlock();
 }
 
@@ -34 +33 @@
 
         doneRunning = true;
+        d->mutex.unlock();
 }
 
@@ -46 +46 @@
 TDDeviceChangeEventDispatcher::~TDDeviceChangeEventDispatcher() {
         this->wait();
-        d->mutex.unlock();
 }
 
@@ -56 +55 @@
         d->event(deviceId, changeEvent, changeType, d->id, d->context);
         doneRunning = true;
+        d->mutex.unlock();
 }
 
@@ -67 +67 @@
 TDRawDeviceEventDispatcher::~TDRawDeviceEventDispatcher() {
         this->wait();
-        d->mutex.unlock();
 }
 
@@ -77 +76 @@
         d->event(strData.c_str(), controllerId, d->id, d->context);
         doneRunning = true;
+        d->mutex.unlock();
 }
 
@@ -88 +88 @@
 TDSensorEventDispatcher::~TDSensorEventDispatcher() {
         this->wait();
-        d->mutex.unlock();
 }
 
@@ -98 +97 @@
         d->event(protocol.c_str(), model.c_str(), sensorId, dataType, value.c_str(), timestamp, d->id, d->context);
         doneRunning = true;
+        d->mutex.unlock();
 }