From 15fccc31d693c1dc9e8eb23c3dade758e77a513e Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Thu, 11 Jun 2026 16:49:06 +0200
Subject: [PATCH] Fix AM to FM dual-watch RX reconfiguration (issue #389)

---
 App/radio.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/App/radio.c b/App/radio.c
index 56316da2..8d6c707e 100644
--- a/App/radio.c
+++ b/App/radio.c
@@ -805,6 +805,9 @@ void RADIO_SetupRegisters(bool switchToForeground)
     #endif
     BK4819_SetFrequency(Frequency);
 
+    // Keep the demodulator in sync when retuning without entering RX audio.
+    RADIO_SetModulation(gRxVfo->Modulation);
+
     BK4819_SetupSquelch(
         gRxVfo->SquelchOpenRSSIThresh,    gRxVfo->SquelchCloseRSSIThresh,
         gRxVfo->SquelchOpenNoiseThresh,   gRxVfo->SquelchCloseNoiseThresh,
@@ -1102,7 +1105,7 @@ void RADIO_SetModulation(ModulationMode_t modulation)
                 BK4819_WriteRegister(0x55, 0x31a9);
             #endif
 
-            BK4819_SetFilterBandwidth(RADIO_GetAMFilterBandwidth(gCurrentVfo), true);
+            BK4819_SetFilterBandwidth(RADIO_GetAMFilterBandwidth(gRxVfo), true);
             break;
         }