[dss-commits] r8860 - dss/trunk/core

dss-commits at forum.digitalstrom.org dss-commits at forum.digitalstrom.org
Thu Oct 22 16:11:12 CEST 2009


Author: pstaehlin
Date: 2009-10-22 16:11:12 +0200 (Thu, 22 Oct 2009)
New Revision: 8860

Modified:
   dss/trunk/core/model.cpp
Log:
Don't warn about multiple additions to zone 0

Modified: dss/trunk/core/model.cpp
===================================================================
--- dss/trunk/core/model.cpp	2009-10-22 14:11:10 UTC (rev 8859)
+++ dss/trunk/core/model.cpp	2009-10-22 14:11:12 UTC (rev 8860)
@@ -1772,7 +1772,10 @@
     if(!contains(m_Devices, _device)) {
       m_Devices.push_back(_device);
     } else {
-      Logger::getInstance()->log("Zone::addDevice: DUPLICATE DEVICE Detected Zone: " + intToString(m_ZoneID) + " device: " + _device.getDSID().toString(), lsWarning);
+      // don't warn about multiple additions to zone 0
+      if(m_ZoneID != 0) {
+        Logger::getInstance()->log("Zone::addDevice: DUPLICATE DEVICE Detected Zone: " + intToString(m_ZoneID) + " device: " + _device.getDSID().toString(), lsWarning);
+      }
     }
     _device.getDevice().setZoneID(m_ZoneID);
   } // addDevice



More information about the dss-commits mailing list