From 7ed5dec0bb3d80fbe364fd36ba2e218e39709315 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Wed, 6 Feb 2019 14:20:12 +0100
Subject: [PATCH] Auto exit on successfull registration

---
 radio/src/gui/128x64/model_setup.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index f9fa88cdd..7c7092728 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1040,15 +1040,23 @@ void menuModelSetup(event_t event)
         lcdDrawTextAlignedLeft(y, INDENT "Module");
         lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_RANGE, (menuHorizontalPosition==0 ? attr : 0) );
         lcdDrawText(lcdLastRightPos, y, "[Reg]", (menuHorizontalPosition==1 ? attr : 0) );
-        if (attr && s_editMode>0) {
-          if (menuHorizontalPosition == 0 )
-            moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_RANGECHECK;
-          else
-            moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_REGISTER;
+        if (attr && s_editMode>0 && menuHorizontalPosition == 0 ) {
+          moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_RANGECHECK;
+        }
+        if(attr && menuHorizontalPosition == 1) {
+          if (event == EVT_KEY_BREAK(KEY_ENTER)) {
+            moduleSettings[INTERNAL_MODULE].mode ^= MODULE_MODE_REGISTER;
+          }
+          if (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_REGISTER) {
+            s_editMode = 1;
+          }
         }
         if (attr && s_editMode==0) {
           moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_NORMAL;
         }
+        if (attr && moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_NORMAL) {
+          s_editMode = 0;
+        }
       break;
 
       case ITEM_MODEL_INTERNAL_MODULE_ADD_RECEIVER: