summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <[email protected]>2015-06-18 02:45:20 +0300
committerJasem Mutlaq <[email protected]>2015-06-18 02:45:20 +0300
commitfcb95874db506020a4373644fb5d7caa5647c5fb (patch)
treef773795e4005e5bf5cfbe4433b876b331e04ac98
parent20552ff82fccd1165affa1047e335b681494cbf4 (diff)
Fix running two drivers with support multiple devices per driver (MDPD)
-rw-r--r--kstars/ekos/ekosmanager.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kstars/ekos/ekosmanager.cpp b/kstars/ekos/ekosmanager.cpp
index 70ecc34..fe1e60e 100644
--- a/kstars/ekos/ekosmanager.cpp
+++ b/kstars/ekos/ekosmanager.cpp
@@ -768,17 +768,17 @@ bool EkosManager::start()
// For #1, we modify guider_di to make a unique label for the other device with postfix "Guide"
// For #2, we set guider_di to NULL and we prompt the user to select which device is primary ccd and which is guider
// since this is the only way to find out in real time.
- if (guider_di == ccd_di)
+ if (guider_di->getDriver() == ccd_di->getDriver())
{
if (guider_di->getAuxInfo().value("mdpd", false).toBool() == true)
guider_di = NULL;
else
{
- QVariantMap vMap = guider_di->getAuxInfo();
- vMap.insert("DELETE", 1);
- guider_di = new DriverInfo(ccd_di);
+ //QVariantMap vMap = guider_di->getAuxInfo();
+ //vMap.insert("DELETE", 1);
+ //guider_di = new DriverInfo(ccd_di);
guider_di->setUniqueLabel(guider_di->getTreeLabel() + " Guide");
- guider_di->setAuxInfo(vMap);
+ //guider_di->setAuxInfo(vMap);
}
}
}
@@ -1151,14 +1151,14 @@ void EkosManager::cleanDevices()
if (localMode)
{
DriverManager::Instance()->stopDevices(managedDevices);
- if (guider_di)
+ /*if (guider_di)
{
if (guider_di->getAuxInfo().value("DELETE") == 1)
{
delete(guider_di);
guider_di=NULL;
}
- }
+ }*/
}
else if (remote_indi)
{