From b77332e75af444bb1f962c2fb4317d87ee87f4df Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 4 Jan 2017 09:27:57 +0100
Subject: [PATCH] [Horus] Fixes #4177

---
 radio/src/gui/480x272/model_setup.cpp | 8 +++-----
 radio/src/gui/gui_common.h            | 2 +-
 radio/src/gui/gui_common_arm.cpp      | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp
index 19de0ca64..9a41b74a0 100644
--- a/radio/src/gui/480x272/model_setup.cpp
+++ b/radio/src/gui/480x272/model_setup.cpp
@@ -210,7 +210,6 @@ int getSwitchWarningsCount()
 
 bool menuModelSetup(event_t event)
 {
-  int l_posHorz = menuHorizontalPosition;
   bool CURSOR_ON_CELL = (menuHorizontalPosition >= 0);
 
   // Switch to external antenna confirmation
@@ -451,9 +450,6 @@ bool menuModelSetup(event_t event)
         unsigned int newStates = 0;
         for (int i=0, current=0; i<NUM_SWITCHES; i++) {
           if (SWITCH_WARNING_ALLOWED(i)) {
-            if (!READ_ONLY() && attr && l_posHorz==current) {
-              storageDirty(EE_MODEL);
-            }
             unsigned int state = ((g_model.switchWarningState >> (3*i)) & 0x07);
             LcdFlags color = (state > 0 ? TEXT_COLOR : TEXT_DISABLE_COLOR);
             if (attr && menuHorizontalPosition < 0) {
@@ -464,7 +460,9 @@ bool menuModelSetup(event_t event)
             s[1] = "x\300-\301"[state];
             s[2] = '\0';
             lcdDrawText(MODEL_SETUP_2ND_COLUMN+i*25, y, s, color|(menuHorizontalPosition==current ? attr : 0));
-            if (attr && menuHorizontalPosition==current) CHECK_INCDEC_MODELVAR_ZERO_CHECK(event, state, 3, IS_3POS(i) ? 0 : isSwitchWarningStateAvailable);
+            if (!READ_ONLY() && attr && menuHorizontalPosition==current) {
+              CHECK_INCDEC_MODELVAR_ZERO_CHECK(event, state, 3, IS_CONFIG_3POS(i) ? NULL : isSwitch2POSWarningStateAvailable);
+            }
             newStates |= (state << (3*i));
             ++current;
           }
diff --git a/radio/src/gui/gui_common.h b/radio/src/gui/gui_common.h
index 034e9f970..0eb2aec0f 100644
--- a/radio/src/gui/gui_common.h
+++ b/radio/src/gui/gui_common.h
@@ -73,7 +73,7 @@ bool modelHasNotes();
 #endif
 
 #if defined(COLORLCD)
-bool isSwitchWarningStateAvailable(int state);
+bool isSwitch2POSWarningStateAvailable(int state);
 #endif
 
 #if defined(GUI)
diff --git a/radio/src/gui/gui_common_arm.cpp b/radio/src/gui/gui_common_arm.cpp
index b7894f6ba..fc5da2d99 100644
--- a/radio/src/gui/gui_common_arm.cpp
+++ b/radio/src/gui/gui_common_arm.cpp
@@ -375,7 +375,7 @@ bool isSwitchAvailableInMixes(int swtch)
 }
 
 #if defined(COLORLCD)
-bool isSwitchWarningStateAvailable(int state)
+bool isSwitch2POSWarningStateAvailable(int state)
 {
   return (state != 2); // two pos switch - middle state not available
 }