Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug preventing frequency updates from being properly suppressed on Linux #585

Merged
merged 4 commits into from
Oct 30, 2023
Merged

Fix bug preventing frequency updates from being properly suppressed on Linux #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d0c498
Fix bug preventing frequency updates from being properly suppressed o…
tmiw Oct 29, 2023
d465209
Test: disable focus check prior to frequency change.
tmiw Oct 30, 2023
00c7f86
Confirmed working on macOS.
tmiw Oct 30, 2023
c2c950e
Add PR #585 to changelog.
tmiw Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ endif()
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "Minimum OS X deployment version")

set(PROJECT_NAME FreeDV)
set(PROJECT_VERSION 1.9.4)
set(PROJECT_VERSION 1.9.5)
set(PROJECT_DESCRIPTION "HF Digital Voice for Radio Amateurs")
set(PROJECT_HOMEPAGE_URL "https://freedv.org")

Expand Down Expand Up @@ -46,7 +46,7 @@ endif(APPLE)

# Adds a tag to the end of the version string. Leave empty
# for official release builds.
set(FREEDV_VERSION_TAG "")
set(FREEDV_VERSION_TAG "devel")

# Prevent in-source builds to protect automake/autoconf config.
# If an in-source build is attempted, you will still need to clean up a few
Expand Down
5 changes: 5 additions & 0 deletions USER_MANUAL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,11 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes

# Release Notes

## V1.9.5 TBD 2023

1. Bugfixes:
* Fix bug preventing frequency updates from being properly suppressed when frequency control is in focus. (PR #585)

## V1.9.4 October 2023

1. Bugfixes:
Expand Down
10 changes: 4 additions & 6 deletions src/ongui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ bool MainFrame::OpenHamlibRig() {
};

wxGetApp().rigFrequencyController->onRigConnected += [&](IRigController*) {
if (wxGetApp().appConfiguration.rigControlConfiguration.hamlibEnableFreqModeChanges)
if (wxGetApp().rigFrequencyController && wxGetApp().appConfiguration.rigControlConfiguration.hamlibEnableFreqModeChanges)
{
wxGetApp().rigFrequencyController->setFrequency(wxGetApp().appConfiguration.reportingConfiguration.reportingFrequency);
wxGetApp().rigFrequencyController->setMode(getCurrentMode_());
Expand Down Expand Up @@ -401,15 +401,13 @@ bool MainFrame::OpenHamlibRig() {
}

// Update frequency box
if (!wxGetApp().appConfiguration.reportingConfiguration.reportingEnabled ||
!wxGetApp().appConfiguration.reportingConfiguration.manualFrequencyReporting)
if (!suppressFreqModeUpdates_ && (
!wxGetApp().appConfiguration.reportingConfiguration.reportingEnabled ||
!wxGetApp().appConfiguration.reportingConfiguration.manualFrequencyReporting))
{
m_cboReportFrequency->SetValue(wxString::Format("%.4f", freq/1000.0/1000.0));
}
m_txtModeStatus->Refresh();

// Suppress updates if the Report Frequency box has focus.
suppressFreqModeUpdates_ = m_cboReportFrequency->HasFocus();
});
};

Expand Down
Loading