Fix possible problem through wrong use pf BACK_BUTTON

The enum BUTTONTYPE doesn't mach array indices.
mindboards · Sep 15, 2013 · 46174f8 · 46174f8
1 parent 5382457
commit 46174f8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lms2012/lms2012/source/lms2012.c b/lms2012/lms2012/source/lms2012.c
@@ -108,6 +108,9 @@
 #define   DEBUG_TRACE_VM
 #endif
 
+// Buttons are mapped differently in the enum BUTTONTYPE and in ButtonState.
+#define IDX_BACK_BUTTON BACK_BUTTON-1
+
 //*****************************************************************************
 // UI bootloader
 //*****************************************************************************
@@ -548,8 +551,8 @@ DSPSTAT   ExecuteByteCode(IP pByteCode,GP pGlobals,LP pLocals)
   VMInstance.Priority             =  1;
 
   // Execute special byte code stream
-  UiInstance.ButtonState[BACK_BUTTON] &= ~BUTTON_LONGPRESS;
-  while ((*VMInstance.ObjectIp != opOBJECT_END) && (!(UiInstance.ButtonState[BACK_BUTTON] & BUTTON_LONGPRESS)))
+  UiInstance.ButtonState[IDX_BACK_BUTTON] &= ~BUTTON_LONGPRESS;
+  while ((*VMInstance.ObjectIp != opOBJECT_END) && (!(UiInstance.ButtonState[IDX_BACK_BUTTON] & BUTTON_LONGPRESS)))
   {
     VMInstance.DispatchStatus       =  NOBREAK;
     VMInstance.Priority             =  C_PRIORITY;
@@ -585,7 +588,7 @@ DSPSTAT   ExecuteByteCode(IP pByteCode,GP pGlobals,LP pLocals)
   }
   Result                          =  VMInstance.DispatchStatus;
 
-  UiInstance.ButtonState[BACK_BUTTON] &= ~BUTTON_LONGPRESS;
+  UiInstance.ButtonState[IDX_BACK_BUTTON] &= ~BUTTON_LONGPRESS;
 
   // Restore running object parameters
   VMInstance.Priority             =  VMInstance.PrioritySave;