From d4685c9e4e44be04b3ffd7f4789b32a76e669876 Mon Sep 17 00:00:00 2001
From: "gruvin@gmail.com"
 <gruvin@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Thu, 23 Aug 2012 01:53:25 +0000
Subject: [PATCH] A better way to cancel DSM2 range-check mode on [EXIT long].
 Thanks Bertrand (again!).

---
 src/menus.cpp       | 3 ---
 src/model_menus.cpp | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/menus.cpp b/src/menus.cpp
index 7e16fa6e5..d53b20a88 100644
--- a/src/menus.cpp
+++ b/src/menus.cpp
@@ -476,9 +476,6 @@ uint8_t m_posHorz;
 void popMenu()
 {
   if (g_menuStackPtr>0) {
-#ifdef DSM2
-    s_rangecheck_mode = 0;
-#endif
     g_menuStackPtr = g_menuStackPtr-1;
     AUDIO_KEYPAD_UP();
     m_posHorz = 0;
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 6e240f3ca..74c2d5cfa 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -578,6 +578,12 @@ void menuProcModel(uint8_t event)
   lcd_outdezNAtt(7*FW,0,g_eeGeneral.currModel+1,INVERS+LEADING0,2);
 
   uint8_t protocol = g_model.protocol;
+
+#ifdef DSM2
+  if (event == EVT_KEY_LONG(KEY_EXIT))
+    s_rangecheck_mode = 0;
+#endif
+
   MENU(STR_MENUSETUP, menuTabModel, e_Model, ((protocol<=PROTO_PPMSIM||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 14 : 13), {0,ZCHAR|(sizeof(g_model.name)-1),2,2,0,0,0,0,0,0,0,NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1,1,2});
 
   uint8_t  sub = m_posVert - 1;