[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kstars] kstars/indi: Remove managed driver properly in case of unorderly shutdown of INDI server
From:       Jasem Mutlaq <mutlaqja () ikarustech ! com>
Date:       2014-07-09 7:09:57
Message-ID: E1X4m0r-0004Aq-D3 () scm ! kde ! org
[Download RAW message or body]

Git commit 7fff2b771accdcece7b4d14d26d9d982cc9390ac by Jasem Mutlaq.
Committed on 09/07/2014 at 07:08.
Pushed by mutlaqja into branch 'master'.

Remove managed driver properly in case of unorderly shutdown of INDI server

M  +4    -1    kstars/indi/indilistener.cpp

http://commits.kde.org/kstars/7fff2b771accdcece7b4d14d26d9d982cc9390ac

diff --git a/kstars/indi/indilistener.cpp b/kstars/indi/indilistener.cpp
index 510e618..a0acfdc 100644
--- a/kstars/indi/indilistener.cpp
+++ b/kstars/indi/indilistener.cpp
@@ -104,8 +104,11 @@ void INDIListener::removeClient(ClientManager *cm)
 
     while (it != devices.end())
     {
-        if ( (*it)->getDriverInfo()->getClientManager() == cm)
+        DriverInfo *dv = (*it)->getDriverInfo();
+        //if ( (*it)->getDriverInfo()->getClientManager() == cm)
+        if (dv && cm->isDriverManaged(dv))
         {
+            cm->removeManagedDriver(dv);
             cm->disconnect(this);
             it = devices.erase(it);
         }

[prev in list] [next in list] [prev in thread] [next in thread]