From d7c3918b7862811a25e100cc865cfaba3b13e216 Mon Sep 17 00:00:00 2001
From: Sjef Verhoeven PE5PVB <pe5pvb@het-bar.net>
Date: Thu, 18 Apr 2024 10:09:38 +0200
Subject: [PATCH] Fix: Menu was not correct closed after starting FMDX Scan

---
 TEF6686_ESP32.ino | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino
index df899e4..bb725f5 100644
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -1992,6 +1992,7 @@ void ModeButtonPress() {
             menupage = INDEX;
             menuitem = 0;
             UpdateFonts(1);
+            if (spispeed == 7) tft.setSPISpeed(30);
             BuildMenu();
             menu = true;
             ScreensaverTimerSet(OFF);
@@ -2037,6 +2038,7 @@ void ModeButtonPress() {
             menuoption = ITEM1;
             menupage = INDEX;
             menuitem = 0;
+            if (spispeed == 7) tft.setSPISpeed(30);
             BuildMenu();
           }
         }
@@ -2665,7 +2667,7 @@ void ShowFreq(int mode) {
   attachInterrupt(digitalPinToInterrupt(ROTARY_PIN_A), read_encoder, CHANGE);
   attachInterrupt(digitalPinToInterrupt(ROTARY_PIN_B), read_encoder, CHANGE);
 
-  setAutoSpeedSPI();
+  if (spispeed == 7) setAutoSpeedSPI();
   rdsreset = true;
   licold = 254;
   ECCold = 253;
@@ -3957,6 +3959,10 @@ void endMenu() {
   menu = false;
   menuopen = false;
   LowLevelInit = true;
+  submenu = false;
+  menuoption = ITEM1;
+  menupage = INDEX;
+  menuitem = 0;
   EEPROM.writeByte(EE_BYTE_VOLSET, VolSet);
   EEPROM.writeUInt(EE_UINT16_CONVERTERSET, ConverterSet);
   EEPROM.writeUInt(EE_UINT16_FMLOWEDGESET, LowEdgeSet);