mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-05-29 04:42:28 -04:00
Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration
This commit is contained in:
commit
1eea4cd9cf
@ -115,7 +115,6 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
|
|
||||||
QTimer *guiTimer = new QTimer(this);
|
QTimer *guiTimer = new QTimer(this);
|
||||||
connect(guiTimer, SIGNAL(timeout()), this, SLOT(guiUpdate()));
|
connect(guiTimer, SIGNAL(timeout()), this, SLOT(guiUpdate()));
|
||||||
guiTimer->start(100); //Don't change the 100 ms!
|
|
||||||
|
|
||||||
m_auto=false;
|
m_auto=false;
|
||||||
m_waterfallAvg = 1;
|
m_waterfallAvg = 1;
|
||||||
@ -291,7 +290,11 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
if(ui->actionCuteSDR->isChecked()) on_actionCuteSDR_triggered();
|
if(ui->actionCuteSDR->isChecked()) on_actionCuteSDR_triggered();
|
||||||
if(ui->actionAFMHot->isChecked()) on_actionAFMHot_triggered();
|
if(ui->actionAFMHot->isChecked()) on_actionAFMHot_triggered();
|
||||||
if(ui->actionBlue->isChecked()) on_actionBlue_triggered();
|
if(ui->actionBlue->isChecked()) on_actionBlue_triggered();
|
||||||
// End of MainWindow constructor
|
|
||||||
|
// only start the guiUpdate timer after this constructor has finished
|
||||||
|
QTimer::singleShot (0, [=] {
|
||||||
|
guiTimer->start(100); //Don't change the 100 ms!
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------- MainWindow destructor
|
//--------------------------------------------------- MainWindow destructor
|
||||||
|
Loading…
x
Reference in New Issue
Block a user