diff --git a/WSJT-X_Users_Guide.docx b/WSJT-X_Users_Guide.docx index 7b9651642..2a7454111 100644 Binary files a/WSJT-X_Users_Guide.docx and b/WSJT-X_Users_Guide.docx differ diff --git a/devsetup.ui b/devsetup.ui index e2eaaf178..e4189f498 100644 --- a/devsetup.ui +++ b/devsetup.ui @@ -408,7 +408,7 @@ - -20 + 0 10 diff --git a/mainwindow.cpp b/mainwindow.cpp index b926b561f..e2f833529 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -950,6 +950,7 @@ void MainWindow::closeEvent(QCloseEvent*) void MainWindow::OnExit() { g_pWideGraph->saveSettings(); + if(m_fname != "") killFile(); m_killAll=true; mem_jt9->detach(); QFile quitFile(m_appDir + "/.quit"); @@ -2818,19 +2819,17 @@ void MainWindow::on_pbT2R_clicked() void MainWindow::on_readFreq_clicked() { - if(m_dontReadFreq) { - m_dontReadFreq=false; - } else { - double fMHz=rig->getFreq(RIG_VFO_CURR)/1000000.0; - if(fMHz<0.0) { - QString rt; - rt.sprintf("Rig control error %d\nFailed to read frequency.", - int(1000000.0*fMHz)); - msgBox(rt); - m_catEnabled=false; - } - int ndiff=1000000.0*(fMHz-m_dialFreq); - if(ndiff!=0) dialFreqChanged2(fMHz); - qDebug() << "A" << fMHz << ndiff; -} + m_dontReadFreq=false; + double fMHz=rig->getFreq(RIG_VFO_CURR)/1000000.0; + if(fMHz<0.0) { + QString rt; + rt.sprintf("Rig control error %d\nFailed to read frequency.", + int(1000000.0*fMHz)); + msgBox(rt); + m_catEnabled=false; + } + if(fMHz<0.01 or fMHz>1300.0) fMHz=0; + int ndiff=1000000.0*(fMHz-m_dialFreq); + if(ndiff!=0) dialFreqChanged2(fMHz); } +