mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-03-22 08:09:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed frequency select not updating when disabling VFO

Browse Source
This commit is contained in:
Ryzerth 2021-04-24 19:26:22 +02:00
parent 35122708be
commit 8305750016
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/cmake.yml → .github/workflows/build_linux_amd64.yml vendored
View File

@ -1,6 +1,6 @@
name: Linux Build name: Linux Build
on: [push] on: [push, pull_request]
env: env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@ -50,5 +50,5 @@ jobs:
- name: Save Deb Archive - name: Save Deb Archive
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: deb-archive name: sdrpp_debian_amd64
path: /home/runner/work/SDRPlusPlus/SDRPlusPlus/sdrpp_debian_amd64.deb path: /home/runner/work/SDRPlusPlus/SDRPlusPlus/sdrpp_debian_amd64.deb

4
core/src/gui/main_window.cpp
View File

@ -396,9 +396,9 @@ void drawWindow() {
sigpath::vfoManager.updateFromWaterfall(&gui::waterfall); sigpath::vfoManager.updateFromWaterfall(&gui::waterfall);
// Handle selection of another VFO // 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::waterfall.selectedVFOChanged = false;
gui::freqSelect.setFrequency(vfo->generalOffset + gui::waterfall.getCenterFrequency());
gui::freqSelect.frequencyChanged = false; gui::freqSelect.frequencyChanged = false;
} }

2
core/src/gui/widgets/waterfall.cpp
View File

@ -234,10 +234,12 @@ namespace ImGui {
for (auto const& [name, vfo] : vfos) { for (auto const& [name, vfo] : vfos) {
available = true; available = true;
selectedVFO = name; selectedVFO = name;
selectedVFOChanged = true;
return; return;
} }
if (!available) { if (!available) {
selectedVFO = ""; selectedVFO = "";
selectedVFOChanged = true;
} }
} }