w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-24 02:12:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Protect against using null pointer m_astroWidget.

Browse Source
This commit is contained in:
Joe Taylor 2022-07-30 13:07:49 -04:00
parent 7cdb363c8c
commit 3bdadf247a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widgets/mainwindow.cpp
View File

@ -1107,7 +1107,7 @@ void MainWindow::on_the_minute ()
//--------------------------------------------------- MainWindow destructor //--------------------------------------------------- MainWindow destructor
MainWindow::~MainWindow() MainWindow::~MainWindow()
{ {
m_astroWidget.reset (); if(m_astroWidget) m_astroWidget.reset ();
auto fname {QDir::toNativeSeparators(m_config.writeable_data_dir ().absoluteFilePath ("wsjtx_wisdom.dat"))}; auto fname {QDir::toNativeSeparators(m_config.writeable_data_dir ().absoluteFilePath ("wsjtx_wisdom.dat"))};
fftwf_export_wisdom_to_filename (fname.toLocal8Bit ()); fftwf_export_wisdom_to_filename (fname.toLocal8Bit ());
m_audioThread.quit (); m_audioThread.quit ();
@ -2042,9 +2042,9 @@ void MainWindow::on_autoButton_clicked (bool checked)
if(m_auto) { if(m_auto) {
m_nclearave=1; m_nclearave=1;
echocom_.nsum=0; echocom_.nsum=0;
m_astroWidget->selectOwnEcho(); if(m_astroWidget) m_astroWidget->selectOwnEcho();
} else { } else {
m_astroWidget->selectOnDxEcho(); if(m_astroWidget) m_astroWidget->selectOnDxEcho();
} }
} }
m_tAutoOn=QDateTime::currentMSecsSinceEpoch()/1000; m_tAutoOn=QDateTime::currentMSecsSinceEpoch()/1000;
@ -2544,7 +2544,7 @@ void MainWindow::closeEvent(QCloseEvent * e)
m_valid = false; // suppresses subprocess errors m_valid = false; // suppresses subprocess errors
m_config.transceiver_offline (); m_config.transceiver_offline ();
writeSettings (); writeSettings ();
m_astroWidget.reset (); if(m_astroWidget) m_astroWidget.reset ();
m_guiTimer.stop (); m_guiTimer.stop ();
m_prefixes.reset (); m_prefixes.reset ();
m_shortcuts.reset (); m_shortcuts.reset ();
@ -7108,7 +7108,7 @@ void MainWindow::on_actionEcho_triggered()
// 01234567890123456789012345678901234567 // 01234567890123456789012345678901234567
displayWidgets(nWidgets("00000000000000000010001000000000000000")); displayWidgets(nWidgets("00000000000000000010001000000000000000"));
fast_config(false); fast_config(false);
m_astroWidget->selectOnDxEcho(); if(m_astroWidget) m_astroWidget->selectOnDxEcho();
statusChanged(); statusChanged();
} }
@ -7932,7 +7932,7 @@ void MainWindow::transmit (double snr)
if(m_mode=="Echo") { if(m_mode=="Echo") {
m_fDither=0.; m_fDither=0.;
if(m_astroWidget->bDither()) m_fDither = QRandomGenerator::global()->bounded(20.0) - 10.0; //Dither by +/- 10 Hz if(m_astroWidget && m_astroWidget->bDither()) m_fDither = QRandomGenerator::global()->bounded(20.0) - 10.0; //Dither by +/- 10 Hz
Q_EMIT sendMessage (m_mode, 27, 1024.0, 1500.0+m_fDither, 0.0, m_soundOutput, Q_EMIT sendMessage (m_mode, 27, 1024.0, 1500.0+m_fDither, 0.0, m_soundOutput,
m_config.audio_output_channel(), false, false, snr, m_TRperiod); m_config.audio_output_channel(), false, false, snr, m_TRperiod);
// qDebug() << "aa" << m_s6 << m_freqNominal << m_rigState.frequency() << m_fDither; // qDebug() << "aa" << m_s6 << m_freqNominal << m_rigState.frequency() << m_fDither;