From ff878bf8842b708758437dbf6ff1867fa4fb511e Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 11 May 2012 19:21:27 +0000
Subject: [PATCH] THR Warn bug fixed.

---
 src/menus.cpp       |  3 ++-
 src/menus.h         |  4 ++++
 src/model_menus.cpp | 15 ++++++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/menus.cpp b/src/menus.cpp
index 24e1d6900..9a79ba200 100644
--- a/src/menus.cpp
+++ b/src/menus.cpp
@@ -195,7 +195,8 @@ bool check(uint8_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t menuTa
   int8_t maxcol = MAXCOL(m_posVert);
 
 #if defined(ROTARY_ENCODERS)
-  check_rotary_encoder();
+  if (!(s_warning || s_sdcard_error || s_menu_count))
+    check_rotary_encoder();
   if (m_posVert < 0 && (event==EVT_KEY_FIRST(BTN_REa) || event==EVT_KEY_FIRST(BTN_REb) || event==EVT_KEY_FIRST(KEY_MENU))) {
     popMenu();
     killEvents(event);
diff --git a/src/menus.h b/src/menus.h
index e710b0cdc..b3d81fba6 100644
--- a/src/menus.h
+++ b/src/menus.h
@@ -204,6 +204,10 @@ extern uint8_t s_menu_flags;
 extern uint8_t s_menu_offset;
 extern bool s_menu_more;
 const char * displayMenu(uint8_t event);
+extern const pm_char * s_sdcard_error;
+#else
+#define s_menu_count 0
+#define s_sdcard_error 0
 #endif
 
 #endif
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 845b74072..296e910c0 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -204,7 +204,10 @@ void menuProcModelSelect(uint8_t event)
   }
 
 #if defined(SDCARD)
-  uint8_t _event = (s_warning || s_sdcard_error || s_menu_count) ? 0 : event;
+  uint8_t _event = event;
+  if (s_warning || s_sdcard_error || s_menu_count) {
+    _event = 0;
+  }
 #else
   uint8_t _event = s_warning ? 0 : event;
 #endif
@@ -239,9 +242,7 @@ void menuProcModelSelect(uint8_t event)
         s_copyTgtOfs = 0;
         s_copySrcRow = -1;
         s_editMode = -1;
-#if defined(PCBV4)
         eeCheck(true);
-#endif
         break;
       case EVT_KEY_LONG(KEY_EXIT):
         if (s_copyMode && s_copyTgtOfs == 0 && g_eeGeneral.currModel != sub && eeModelExists(sub)) {
@@ -663,15 +664,15 @@ void menuProcModel(uint8_t event)
 
       case ITEM_MODEL_THROTTLE_TRIM:
         lcd_putsLeft(y, STR_TTRIM);
-        menu_lcd_onoff(MODEL_PARAM_OFS, y, g_model.disableThrottleWarning, attr) ;
-        if (attr) CHECK_INCDEC_MODELVAR(event,g_model.disableThrottleWarning,0,1);
+        menu_lcd_onoff(MODEL_PARAM_OFS, y, g_model.thrTrim, attr) ;
+        if (attr) CHECK_INCDEC_MODELVAR(event,g_model.thrTrim,0,1);
         break;
 
       case ITEM_MODEL_THROTTLE_WARNING:
       {
         lcd_putsLeft(y, STR_THROTTLEWARNING);
-        menu_lcd_onoff(MODEL_PARAM_OFS, y, !g_model.thrTrim, attr) ;
-        if (attr) g_model.thrTrim = !checkIncDecModel(event, !g_model.thrTrim, 0, 1);
+        menu_lcd_onoff(MODEL_PARAM_OFS, y, !g_model.disableThrottleWarning, attr) ;
+        if (attr) g_model.disableThrottleWarning = !checkIncDecModel(event, !g_model.disableThrottleWarning, 0, 1);
         break;
       }