From 600699a1a8d07e0f6ef3b3f1d5b6023e5ac7cca0 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Wed, 4 May 2022 10:05:03 +0100
Subject: [PATCH] VOR Demodulator: Reset filters when navId changes, to avoid
 glitches in calculated radial

---
 plugins/channelrx/demodvor/vordemod.cpp     | 4 ++--
 plugins/channelrx/demodvor/vordemodsink.cpp | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/channelrx/demodvor/vordemod.cpp b/plugins/channelrx/demodvor/vordemod.cpp
index ed3d12f94..2397ac790 100644
--- a/plugins/channelrx/demodvor/vordemod.cpp
+++ b/plugins/channelrx/demodvor/vordemod.cpp
@@ -260,8 +260,8 @@ void VORDemod::applySettings(const VORDemodSettings& settings, bool force)
 
         // Reset state so we don't report old data for new NavId
         m_radial = 0.0f;
-        m_refMag = 0.0f;
-        m_varMag = 0.0f;
+        m_refMag = -200.0f;
+        m_varMag = -200.0f;
         m_morseIdent = "";
     }
     if ((m_settings.m_squelch != settings.m_squelch) || force) {
diff --git a/plugins/channelrx/demodvor/vordemodsink.cpp b/plugins/channelrx/demodvor/vordemodsink.cpp
index 89567f524..5c05b51a8 100644
--- a/plugins/channelrx/demodvor/vordemodsink.cpp
+++ b/plugins/channelrx/demodvor/vordemodsink.cpp
@@ -412,6 +412,8 @@ void VORDemodSCSink::applySettings(const VORDemodSettings& settings, bool force)
             m_identMaxs[i] = 0.0f;
         }
         m_ident = "";
+        m_refGoertzel.reset();
+        m_varGoertzel.reset();
     }
 
     m_settings = settings;