FreeDV
/
freedv-gui
mirror of https://github.com/drowe67/freedv-gui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'ms-ui-sideband' into ms-pskreporter-improvements

pull/156/head
Mooneer Salem 2021-08-26 01:25:31 -07:00
parent 0eac36715c c17df14a91
commit 66ffcfe08f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hamlib.cpp
View File

@ -262,6 +262,7 @@ void Hamlib::enable_mode_detection(wxStaticText* statusBox, wxTextCtrl* freqBox,
{
m_modeBox->SetLabel(wxT("unk"));
m_modeBox->Enable(false);
m_modeBox->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
m_modeBox = NULL;
}
else
@ -295,6 +296,7 @@ void Hamlib::disable_mode_detection()
// Disable control.
m_modeBox->SetLabel(wxT("unk"));
m_modeBox->Enable(false);
m_modeBox->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
m_modeBox = NULL;
}
}

3
src/ongui.cpp
View File

@ -418,7 +418,8 @@ void MainFrame::togglePTT(void) {
Hamlib *hamlib = wxGetApp().m_hamlib;
wxString hamlibError;
if (wxGetApp().m_boolHamlibUseForPTT && hamlib != NULL) {
if (hamlib->ptt(g_tx, hamlibError) == false) {
// Update mode display on the bottom of the main UI.
if (hamlib->update_frequency_and_mode() != 0 || hamlib->ptt(g_tx, hamlibError) == false) {
wxMessageBox(wxString("Hamlib PTT Error: ") + hamlibError, wxT("Error"), wxOK | wxICON_ERROR, this);
}
}