mirror of
https://github.com/feather-wallet/feather.git
synced 2024-12-23 03:59:29 +00:00
Merge pull request 'Fix indefinite hang when closing wallet via File -> Quit' (#80) from tobtoht/feather:close_without_indefinite_hang into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/80
This commit is contained in:
commit
0f0b033fe4
2 changed files with 11 additions and 4 deletions
|
@ -894,6 +894,8 @@ void MainWindow::menuNewRestoreClicked() {
|
|||
}
|
||||
|
||||
void MainWindow::menuQuitClicked() {
|
||||
cleanupBeforeClose();
|
||||
|
||||
QCoreApplication::quit();
|
||||
}
|
||||
|
||||
|
@ -967,10 +969,7 @@ void MainWindow::homeWidgetChanged(const QString &widgetName) {
|
|||
}
|
||||
|
||||
void MainWindow::closeEvent(QCloseEvent *event) {
|
||||
m_ctx->walletManager->closeWallet();
|
||||
m_ctx->tor->stop();
|
||||
|
||||
this->saveGeo();
|
||||
cleanupBeforeClose();
|
||||
|
||||
QWidget::closeEvent(event);
|
||||
}
|
||||
|
@ -1141,6 +1140,13 @@ void MainWindow::importOutputs() {
|
|||
}
|
||||
}
|
||||
|
||||
void MainWindow::cleanupBeforeClose() {
|
||||
m_ctx->walletManager->closeWallet();
|
||||
m_ctx->tor->stop();
|
||||
|
||||
this->saveGeo();
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow() {
|
||||
delete ui;
|
||||
}
|
||||
|
|
|
@ -125,6 +125,7 @@ private:
|
|||
|
||||
static MainWindow * pMainWindow;
|
||||
void closeEvent(QCloseEvent *event) override;
|
||||
void cleanupBeforeClose();
|
||||
void create_status_bar();
|
||||
void initMain();
|
||||
void loadSkins();
|
||||
|
|
Loading…
Reference in a new issue