From a5a54b6ce75285785d98baed0fe7145f6c928873 Mon Sep 17 00:00:00 2001
From: Peter Feerick <peter.feerick@gmail.com>
Date: Wed, 15 Sep 2021 22:18:42 +1000
Subject: [PATCH] Proper close handler and track MPM state properly

---
 .../gui/colorlcd/radio_spectrum_analyser.cpp  | 35 ++++++++-----------
 .../gui/colorlcd/radio_spectrum_analyser.h    |  1 -
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp
index 3d435fa5e..dba470ace 100644
--- a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp
+++ b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp
@@ -200,22 +200,13 @@ RadioSpectrumAnalyser::RadioSpectrumAnalyser(uint8_t moduleIdx) :
   Page(ICON_RADIO_TOOLS),
   moduleIdx(moduleIdx)
 {
+  setCloseHandler([=]() { stop(); });
   init();
   buildHeader(&header);
   buildBody(&body);
   start();
 }
 
-#if defined(HARDWARE_KEYS)
-void RadioSpectrumAnalyser::onEvent(event_t event)
-{
-  if (event == EVT_KEY_LONG(KEY_EXIT) || event == EVT_KEY_BREAK(KEY_EXIT)) {
-    stop();
-  }
-  Page::onEvent(event);
-}
-#endif
-
 void RadioSpectrumAnalyser::buildHeader(Window * window)
 {
   new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_MENU_SPECTRUM_ANALYSER, 0, COLOR_THEME_SECONDARY1);
@@ -231,10 +222,13 @@ void RadioSpectrumAnalyser::buildBody(FormWindow * window)
 void RadioSpectrumAnalyser::init()
 {
 #if defined(INTERNAL_MODULE_MULTI)
-  if (moduleIdx == INTERNAL_MODULE && g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_NONE) {
-      reusableBuffer.spectrumAnalyser.moduleOFF = true;
-      setModuleType(INTERNAL_MODULE, MODULE_TYPE_MULTIMODULE);
-    }
+  if (moduleIdx == INTERNAL_MODULE &&
+      g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_NONE) {
+    reusableBuffer.spectrumAnalyser.moduleOFF = true;
+    setModuleType(INTERNAL_MODULE, MODULE_TYPE_MULTIMODULE);
+  } else {
+    reusableBuffer.spectrumAnalyser.moduleOFF = false;
+  }
 #endif
 
   if (isModuleR9MAccess(moduleIdx)) {
@@ -271,15 +265,16 @@ void RadioSpectrumAnalyser::start()
 
 void RadioSpectrumAnalyser::stop()
 {
-  new MessageDialog(this, STR_MODULE, STR_STOPPING);
   if (isModulePXX2(moduleIdx)) {
-    moduleState[moduleIdx].readModuleInformation(&reusableBuffer.moduleSetup.pxx2.moduleInformation, PXX2_HW_INFO_TX_ID, PXX2_HW_INFO_TX_ID);
-  }
-  else if (isModuleMultimodule(moduleIdx)) {
-    if (reusableBuffer.spectrumAnalyser.moduleOFF)
+    moduleState[moduleIdx].readModuleInformation(
+        &reusableBuffer.moduleSetup.pxx2.moduleInformation, PXX2_HW_INFO_TX_ID,
+        PXX2_HW_INFO_TX_ID);
+  } else if (isModuleMultimodule(moduleIdx)) {
+    if (reusableBuffer.spectrumAnalyser.moduleOFF) {
       setModuleType(INTERNAL_MODULE, MODULE_TYPE_NONE);
-    else
+    } else {
       moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
+    }
   }
   /* wait 1s to resume normal operation before leaving */
   //  watchdogSuspend(1000);
diff --git a/radio/src/gui/colorlcd/radio_spectrum_analyser.h b/radio/src/gui/colorlcd/radio_spectrum_analyser.h
index bbce7c783..ccca50e48 100644
--- a/radio/src/gui/colorlcd/radio_spectrum_analyser.h
+++ b/radio/src/gui/colorlcd/radio_spectrum_analyser.h
@@ -27,7 +27,6 @@ class RadioSpectrumAnalyser: public Page
 {
   public:
     explicit RadioSpectrumAnalyser(uint8_t moduleIdx);
-    void onEvent(event_t event) override;
 
   protected:
     uint8_t moduleIdx;