Permalink
Browse files

- Fixed: Devices could become invisible when a scene/group was added …

…to the 'hidden devices' room plan with the same idx
  • Loading branch information...
1 parent 5c71ba9 commit ff59013085b3ec4dcdd814bdc04067a6bbf6913f @gizmocuz gizmocuz committed Jan 10, 2017
Showing with 3 additions and 2 deletions.
  1. +1 −0 History.txt
  2. +2 −2 main/WebServer.cpp
View
@@ -1,5 +1,6 @@
Version 3.xxxx (December xth 2016)
- Fixed: Camera Editor, will now always refresh thumbnail in table
+- Fixed: Devices could become invisible when a scene/group was added to the 'hidden devices' room plan with the same idx
- Fixed: JSon float/nan value, solved by upgrading JSonCPP
- Fixed: OZW, when a value is updated and the sensor did not exists before (for example a kWh sensor), it is created (saves a restart)
- Changed: Wind Direction Graph, if sensor does not supports 'Gust', the 'Speed' value is used
View
@@ -7475,7 +7475,7 @@ namespace http {
if (result.size() > 0)
{
std::string pID = result[0][0];
- result = m_sql.safe_query("SELECT DeviceRowID FROM DeviceToPlansMap WHERE (PlanID=='%q')",
+ result = m_sql.safe_query("SELECT DeviceRowID FROM DeviceToPlansMap WHERE (PlanID=='%q') AND (DevSceneType==0)",
pID.c_str());
if (result.size() > 0)
{
@@ -7590,7 +7590,7 @@ namespace http {
if (result.size() > 0)
{
std::string pID = result[0][0];
- result = m_sql.safe_query("SELECT DeviceRowID FROM DeviceToPlansMap WHERE (PlanID=='%q')",
+ result = m_sql.safe_query("SELECT DeviceRowID FROM DeviceToPlansMap WHERE (PlanID=='%q') AND (DevSceneType==0)",
pID.c_str());
if (result.size() > 0)
{

0 comments on commit ff59013

Please sign in to comment.