mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-03-29 07:28:54 -04:00
Repair an object instance initialization order issue that causes crashes
The background thread running the ADIF log load needs a valid configuration object as it now depends on the "Include WAE entities" option.
This commit is contained in:
parent
f61fc47efb
commit
ca41934b68
@ -234,8 +234,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
|
|||||||
m_configurations_button {0},
|
m_configurations_button {0},
|
||||||
m_settings {multi_settings->settings ()},
|
m_settings {multi_settings->settings ()},
|
||||||
ui(new Ui::MainWindow),
|
ui(new Ui::MainWindow),
|
||||||
m_logBook {&m_config},
|
|
||||||
m_config {&m_network_manager, temp_directory, m_settings, &m_logBook, this},
|
m_config {&m_network_manager, temp_directory, m_settings, &m_logBook, this},
|
||||||
|
m_logBook {&m_config},
|
||||||
m_WSPR_band_hopping {m_settings, &m_config, this},
|
m_WSPR_band_hopping {m_settings, &m_config, this},
|
||||||
m_WSPR_tx_next {false},
|
m_WSPR_tx_next {false},
|
||||||
m_rigErrorMessageBox {MessageBox::Critical, tr ("Rig Control Error")
|
m_rigErrorMessageBox {MessageBox::Critical, tr ("Rig Control Error")
|
||||||
|
@ -357,8 +357,8 @@ private:
|
|||||||
QSettings * m_settings;
|
QSettings * m_settings;
|
||||||
QScopedPointer<Ui::MainWindow> ui;
|
QScopedPointer<Ui::MainWindow> ui;
|
||||||
|
|
||||||
LogBook m_logBook; // must be before Configuration construction
|
|
||||||
Configuration m_config;
|
Configuration m_config;
|
||||||
|
LogBook m_logBook; // must be after Configuration construction
|
||||||
WSPRBandHopping m_WSPR_band_hopping;
|
WSPRBandHopping m_WSPR_band_hopping;
|
||||||
bool m_WSPR_tx_next;
|
bool m_WSPR_tx_next;
|
||||||
MessageBox m_rigErrorMessageBox;
|
MessageBox m_rigErrorMessageBox;
|
||||||
|
Loading…
Reference in New Issue
Block a user