From 26756a6a0b3a49637be33019717e6e648cd91015 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Tue, 9 Nov 2021 11:02:50 +0100
Subject: [PATCH] Fix binding being canceled on BindWaitDialog being closed

---
 radio/src/gui/colorlcd/access_settings.cpp | 21 +++++++++++++++++++++
 radio/src/gui/colorlcd/access_settings.h   |  4 ++++
 2 files changed, 25 insertions(+)

diff --git a/radio/src/gui/colorlcd/access_settings.cpp b/radio/src/gui/colorlcd/access_settings.cpp
index 7cc720705..3c4d46981 100644
--- a/radio/src/gui/colorlcd/access_settings.cpp
+++ b/radio/src/gui/colorlcd/access_settings.cpp
@@ -108,6 +108,21 @@ BindRxChoiceMenu::BindRxChoiceMenu(Window* parent, uint8_t moduleIdx,
   setCancelHandler([=]() { moduleState[moduleIdx].mode = MODULE_MODE_NORMAL; });
 }
 
+#if defined(HARDWARE_TOUCH)
+bool BindRxChoiceMenu::onTouchEnd(coord_t x, coord_t y)
+{
+  // Note: onCancel() is not called when the menu is discarded
+  //       by clicking outside the menu window and the onCancel
+  //       handler is not accessible from here
+  if (!Window::onTouchEnd(x, y)) {
+    moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
+    onKeyPress();
+    deleteLater();
+  }
+  return true;
+}
+#endif
+
 BindWaitDialog::BindWaitDialog(Window* parent, uint8_t moduleIdx,
                                uint8_t receiverIdx) :
     Dialog(parent, STR_BIND, {50, 73, LCD_W - 100, LCD_H - 146}),
@@ -164,7 +179,12 @@ void BindWaitDialog::checkEvents()
   }
 
   if (bindInfo.step == BIND_INIT && bindInfo.candidateReceiversCount > 0) {
+
+    // create RX choice dialog...
     new BindRxChoiceMenu(parent, moduleIdx, receiverIdx);
+
+    // ... prevent module mode being reset to NORMAL before exiting
+    setCloseHandler(nullptr);
     deleteLater();
     return;
   }
@@ -249,6 +269,7 @@ void ReceiverButton::startBind()
 
   memclear(&bindInfo, sizeof(bindInfo));
   bindInfo.rxUid = receiverIdx;
+  bindInfo.step = BIND_INIT;
 
   if (isModuleR9MAccess(moduleIdx)) {
     bindInfo.step = BIND_MODULE_TX_INFORMATION_REQUEST;
diff --git a/radio/src/gui/colorlcd/access_settings.h b/radio/src/gui/colorlcd/access_settings.h
index 945fa03af..68d74e8c7 100644
--- a/radio/src/gui/colorlcd/access_settings.h
+++ b/radio/src/gui/colorlcd/access_settings.h
@@ -36,6 +36,10 @@ class BindRxChoiceMenu : public Menu
  protected:
   uint8_t moduleIdx;
   uint8_t receiverIdx;
+
+#if defined(HARDWARE_TOUCH)
+  bool onTouchEnd(coord_t x, coord_t y) override;
+#endif  
 };
 
 class BindWaitDialog : public Dialog