Fixed frequency select not updating when disabling VFO

pull/113/head
Ryzerth 2021-04-24 19:26:22 +02:00
rodzic 35122708be
commit 8305750016
3 zmienionych plików z 6 dodań i 4 usunięć

Wyświetl plik

@ -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

Wyświetl plik

@ -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;
}

Wyświetl plik

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