Changeset 6bd7144 in thomson for elec/CrO2/software/gui.cpp

Timestamp:

Jan 22, 2013, 6:25:57 PM (11 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

65a4aad

Parents:

e017851

Message:

More work on Haiku port

git-svn-id: ​svn://localhost/thomson@29 85ae3b6b-dc8f-4344-a89d-598714f2e4e5

File:

• elec/CrO2/software/gui.cpp (modified) (1 diff)

elec/CrO2/software/gui.cpp

@@ -20 +20 @@
 int pollStatus(Ihandle* ih)
 {
+        uint8_t status;
         try {
-                Ihandle* motoron = (Ihandle*)IupGetAttribute(ih, "target");
-
-                uint8_t status = Device::getDevice().getStatus();
-                if (status & 8)
-                        IupSetAttribute(motoron, "VALUE", "0"); // motor OFF
-                else
-                        IupSetAttribute(motoron, "VALUE", "1"); // motor ON
-        } catch(const char*) {
+                Device& dev = Device::getDevice();
+                status = dev.getStatus();
+        } catch(const char* ex) {
                 // Silently ignore exception if device is not available - not a good
                 // idea to handle it from a timer...
                 // Keep the timer running so it starts working when the device is
                 // plugged
-        }
+                return IUP_DEFAULT;
+        }
+
+        Ihandle* motoron = (Ihandle*)IupGetAttribute(ih, "target");
+        if (status & 8)
+                IupSetAttribute(motoron, "VALUE", "0"); // motor OFF
+        else
+                IupSetAttribute(motoron, "VALUE", "1"); // motor ON
         return IUP_DEFAULT;
 }
+
 
 void startPolling(Ihandle* target) {