mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-09-27 15:46:51 -04:00
Fix logical flaw in Echo mode sequencing.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5585 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
289b4c70f8
commit
25d4388081
@ -568,6 +568,7 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
|
|||||||
|
|
||||||
m_config.transceiver_online (true);
|
m_config.transceiver_online (true);
|
||||||
on_monitorButton_clicked (!m_config.monitor_off_at_startup ());
|
on_monitorButton_clicked (!m_config.monitor_off_at_startup ());
|
||||||
|
if(m_mode=="Echo") monitor(false); //Don't auto-start Monitor in Echo mode.
|
||||||
|
|
||||||
ui->labTol->setStyleSheet( \
|
ui->labTol->setStyleSheet( \
|
||||||
"QLabel { background-color : white; color : black; }");
|
"QLabel { background-color : white; color : black; }");
|
||||||
@ -842,7 +843,10 @@ void MainWindow::dataSink(qint64 frames)
|
|||||||
if(m_echoGraph->isVisible()) m_echoGraph->plotSpec();
|
if(m_echoGraph->isVisible()) m_echoGraph->plotSpec();
|
||||||
m_nclearave=0;
|
m_nclearave=0;
|
||||||
//Don't restart Monitor after an Echo transmission
|
//Don't restart Monitor after an Echo transmission
|
||||||
if(m_bEchoTxed and !m_auto) monitor(false);
|
if(m_bEchoTxed and !m_auto) {
|
||||||
|
monitor(false);
|
||||||
|
m_bEchoTxed=false;
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if( m_dialFreqRxWSPR==0) m_dialFreqRxWSPR=m_dialFreq;
|
if( m_dialFreqRxWSPR==0) m_dialFreqRxWSPR=m_dialFreq;
|
||||||
@ -968,7 +972,7 @@ void MainWindow::on_monitorButton_clicked (bool checked)
|
|||||||
if (!m_transmitting)
|
if (!m_transmitting)
|
||||||
{
|
{
|
||||||
auto prior = m_monitoring;
|
auto prior = m_monitoring;
|
||||||
monitor (checked and (m_mode!="Echo"));
|
monitor (checked);
|
||||||
|
|
||||||
if (checked && !prior)
|
if (checked && !prior)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user