From 1b964702eb872ea04c82cc0fc0ce0aed4bee263a Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 13 Mar 2019 14:45:58 +0100
Subject: [PATCH] [PXX2] BIND should be working again

---
 radio/src/gui/128x64/model_setup.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 59b6fcaf3..c520ff872 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1341,7 +1341,11 @@ void menuModelSetup(event_t event)
               reusableBuffer.moduleSetup.pxx2.bindReceiverId = receiverSlot;
               moduleSettings[moduleIdx].mode ^= MODULE_MODE_BIND;
             }
-            if (s_editMode) {
+            else if (event == EVT_KEY_BREAK(KEY_EXIT)) {
+              moduleSettings[moduleIdx].mode &= ~MODULE_MODE_BIND;
+            }
+            if (moduleSettings[moduleIdx].mode == MODULE_MODE_BIND) {
+              s_editMode = 1;
               if (reusableBuffer.moduleSetup.pxx2.bindStep == BIND_START && reusableBuffer.moduleSetup.pxx2.bindCandidateReceiversCount > 0) {
                 popupMenuItemsCount = min<uint8_t>(reusableBuffer.moduleSetup.pxx2.bindCandidateReceiversCount, PXX2_MAX_RECEIVERS_PER_MODULE);
                 for (uint8_t i=0; i<popupMenuItemsCount; i++) {
@@ -1352,7 +1356,7 @@ void menuModelSetup(event_t event)
               }
             }
             else {
-              moduleSettings[moduleIdx].mode == MODULE_MODE_NORMAL;
+              s_editMode = 0;
             }
           }
           else {