From 830575001652e3b3651e32416694fc5a503578f9 Mon Sep 17 00:00:00 2001
From: Ryzerth <whatsthetgeek@gmail.com>
Date: Sat, 24 Apr 2021 19:26:22 +0200
Subject: [PATCH] Fixed frequency select not updating when disabling VFO

---
 .github/workflows/{cmake.yml => build_linux_amd64.yml} | 4 ++--
 core/src/gui/main_window.cpp                           | 4 ++--
 core/src/gui/widgets/waterfall.cpp                     | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename .github/workflows/{cmake.yml => build_linux_amd64.yml} (97%)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/build_linux_amd64.yml
similarity index 97%
rename from .github/workflows/cmake.yml
rename to .github/workflows/build_linux_amd64.yml
index 2d4262df..20908f53 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/build_linux_amd64.yml
@@ -1,6 +1,6 @@
 name: Linux Build
 
-on: [push]
+on: [push, pull_request]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -50,5 +50,5 @@ jobs:
     - name: Save Deb Archive
       uses: actions/upload-artifact@v2
       with:
-          name: deb-archive
+          name: sdrpp_debian_amd64
           path: /home/runner/work/SDRPlusPlus/SDRPlusPlus/sdrpp_debian_amd64.deb
\ No newline at end of file
diff --git a/core/src/gui/main_window.cpp b/core/src/gui/main_window.cpp
index c9325aac..5de9ea9c 100644
--- a/core/src/gui/main_window.cpp
+++ b/core/src/gui/main_window.cpp
@@ -396,9 +396,9 @@ void drawWindow() {
     sigpath::vfoManager.updateFromWaterfall(&gui::waterfall);
 
     // Handle selection of another VFO
-    if (gui::waterfall.selectedVFOChanged && vfo != NULL) {
+    if (gui::waterfall.selectedVFOChanged) {
+        gui::freqSelect.setFrequency((vfo != NULL) ? (vfo->generalOffset + gui::waterfall.getCenterFrequency()) : gui::waterfall.getCenterFrequency());
         gui::waterfall.selectedVFOChanged = false;
-        gui::freqSelect.setFrequency(vfo->generalOffset + gui::waterfall.getCenterFrequency());
         gui::freqSelect.frequencyChanged = false;
     }
 
diff --git a/core/src/gui/widgets/waterfall.cpp b/core/src/gui/widgets/waterfall.cpp
index 29852b8a..cf7a1c80 100644
--- a/core/src/gui/widgets/waterfall.cpp
+++ b/core/src/gui/widgets/waterfall.cpp
@@ -234,10 +234,12 @@ namespace ImGui {
         for (auto const& [name, vfo] : vfos) {
             available = true;
             selectedVFO = name;
+            selectedVFOChanged = true;
             return;
         }
         if (!available) {
             selectedVFO = "";
+            selectedVFOChanged = true;
         }
     }