Fix various app crashed related to resource system

dresden-elektronik · May 18, 2017 · be873c9 · be873c9
1 parent 256f2ce
commit be873c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/colorspace.cpp b/colorspace.cpp
@@ -1350,6 +1350,9 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray*prhs[])
 ******************************************************************************/
 void MiredColorTemperatureToXY(unsigned short int temperature, unsigned short int *x, unsigned short int *y)
 {
+  if (temperature == 0)
+      temperature = 153;
+
   unsigned long long localX, localY;
   unsigned short int temp = 1000000 / temperature;
 

diff --git a/light_node.cpp b/light_node.cpp
@@ -380,9 +380,14 @@ void LightNode::setColorTemperature(uint16_t colorTemperature)
  */
 const QString &LightNode::colorMode() const
 {
+    static QString foo;
     const ResourceItem *i = item(RStateColorMode);
     DBG_Assert(i != 0);
-    return i->toString();
+    if (i)
+    {
+        return i->toString();
+    }
+    return foo;
 }
 
 /*! Sets the current colormode.

diff --git a/rest_groups.cpp b/rest_groups.cpp
@@ -1230,7 +1230,7 @@ int DeRestPluginPrivate::setGroupState(const ApiRequest &req, ApiResponse &rsp)
 
                         item = i->item(RStateHue);
 
-                        if (item->toNumber() != hue)
+                        if (item && item->toNumber() != hue)
                         {
                             i->setEnhancedHue(hue);
                             item->setValue(hue);
@@ -2150,8 +2150,7 @@ int DeRestPluginPrivate::storeScene(const ApiRequest &req, ApiResponse &rsp)
                             needModify = true;
                         }
                     }
-
-                    if (item->toString() == QLatin1String("ct"))
+                    else if (item->toString() == QLatin1String("ct"))
                     {
                         item = lightNode->item(RStateCt);
                         DBG_Assert(item != 0);