WebSVN – tpanel – Diff – /trunk/tbutton.cpp

         inst = instance;
+    }
     else if (inst < 0 || static_cast<size_t>(inst) >= sr.size())
         inst = mActInstance = 0;
-    bool isSystem = isSystemButton();
-    TButtonStates *buttonStates = getButtonState();
     int lastLevel = 0;
     int lastJoyX = 0;
     int lastJoyY = 0;
+    TButtonStates *buttonStates = nullptr;
+    bool isSystem = isSystemButton();
-    if (buttonStates)
+    if (type == BARGRAPH || type == JOYSTICK || type == MULTISTATE_BARGRAPH)
+    {
+        TButtonStates *buttonStates = getButtonState();
+        if (buttonStates)
+        {
-        lastLevel = buttonStates->getLastLevel();
+            lastLevel = buttonStates->getLastLevel();
-        lastJoyX = buttonStates->getLastJoyX();
+            lastJoyX = buttonStates->getLastJoyX();
-        lastJoyY = buttonStates->getLastJoyY();
+            lastJoyY = buttonStates->getLastJoyY();
-        MSG_DEBUG("lastLevel: " << lastLevel << ", lastJoyX: " << lastJoyX << ", lastJoyY: " << lastJoyY);
+            MSG_DEBUG("lastLevel: " << lastLevel << ", lastJoyX: " << lastJoyX << ", lastJoyY: " << lastJoyY);
-    }
+        }
-    else
+        else
-    {
+        {
-        MSG_ERROR("Button states not found!");
+            MSG_ERROR("Button states not found!");
-        return false;
+            return false;
+        }
+    }
     if (type == MULTISTATE_GENERAL && ar == 1)
         return drawButtonMultistateAni();
     else if (type == BARGRAPH && isSystem && lv == 9)   // System volume button

Subversion Repositories tpanel

(root)/trunk/tbutton.cpp @ 444 – Rev 439 → 442