Merge pull request #1089 from gqrx-sdr/fix-rds-remote

Return correct RDS status in remote control
gqrx-sdr · Jan 25, 2022 · 263db21 · 263db21
2 parents 0b6bdd2 + 85846a4
commit 263db21
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/resources/news.txt b/resources/news.txt
@@ -3,6 +3,7 @@
 
      FIXED: Crash when DSP is restarted after a long pause.
      FIXED: Remove usage of deprecated Qt APIs.
+     FIXED: Return correct RDS status in remote control.
   IMPROVED: Allow ordinary IP addresses to be used in remote control settings.
 
 

diff --git a/src/applications/gqrx/mainwindow.cpp b/src/applications/gqrx/mainwindow.cpp
@@ -289,7 +289,6 @@ MainWindow::MainWindow(const QString& cfgfile, bool edit_conf, QWidget *parent)
 
     // remote control
     connect(remote, SIGNAL(newRDSmode(bool)), uiDockRDS, SLOT(setRDSmode(bool)));
-    connect(uiDockRDS, SIGNAL(rdsDecoderToggled(bool)), remote, SLOT(setRDSstatus(bool)));
     connect(remote, SIGNAL(newFilterOffset(qint64)), this, SLOT(setFilterOffset(qint64)));
     connect(remote, SIGNAL(newFilterOffset(qint64)), uiDockRxOpt, SLOT(setFilterOffset(qint64)));
     connect(remote, SIGNAL(newFrequency(qint64)), ui->freqCtrl, SLOT(setFrequency(qint64)));
@@ -2161,6 +2160,7 @@ void MainWindow::setRdsDecoder(bool checked)
         rx->stop_rds_decoder();
         rds_timer->stop();
     }
+    remote->setRDSstatus(checked);
 }
 
 void MainWindow::onBookmarkActivated(qint64 freq, const QString& demod, int bandwidth)

diff --git a/src/qtgui/dockrds.cpp b/src/qtgui/dockrds.cpp
@@ -143,13 +143,6 @@ void DockRDS::setRDSmode(bool cmd)
 {
     if (!ui->rdsCheckbox->isEnabled())
         return;
-    if (cmd == ui->rdsCheckbox->isChecked())
-        return;
 
-    ui->rdsCheckbox->setDisabled(true);
-    ui->rdsCheckbox->blockSignals(true);
-    emit rdsDecoderToggled(cmd);
     ui->rdsCheckbox->setChecked(cmd);
-    ui->rdsCheckbox->blockSignals(false);
-    ui->rdsCheckbox->setEnabled(true);
 }