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:
tobtoht 2020-10-16 03:17:54 +00:00
commit 0f0b033fe4
2 changed files with 11 additions and 4 deletions

View file

@ -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;
}

View file

@ -125,6 +125,7 @@ private:
static MainWindow * pMainWindow;
void closeEvent(QCloseEvent *event) override;
void cleanupBeforeClose();
void create_status_bar();
void initMain();
void loadSkins();