mirror of
https://github.com/feather-wallet/feather.git
synced 2025-03-12 09:37:47 +00:00
Merge pull request 'Wallet: don't start refresh thread if status not ok' (#330) from tobtoht/feather:wallet_refresh_ok into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/330
This commit is contained in:
commit
0f9cd68b97
2 changed files with 7 additions and 1 deletions
|
@ -1249,7 +1249,9 @@ Wallet::Wallet(Monero::Wallet *w, QObject *parent)
|
||||||
m_daemonUsername = "";
|
m_daemonUsername = "";
|
||||||
m_daemonPassword = "";
|
m_daemonPassword = "";
|
||||||
|
|
||||||
startRefreshThread();
|
if (this->status() == Status_Ok) {
|
||||||
|
startRefreshThread();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Wallet::~Wallet()
|
Wallet::~Wallet()
|
||||||
|
|
|
@ -504,6 +504,10 @@ WalletWizard *MainWindow::createWizard(WalletWizard::Page startPage){
|
||||||
auto *wizard = new WalletWizard(m_ctx, startPage, this);
|
auto *wizard = new WalletWizard(m_ctx, startPage, this);
|
||||||
connect(wizard, &WalletWizard::openWallet, m_ctx, &AppContext::onOpenWallet);
|
connect(wizard, &WalletWizard::openWallet, m_ctx, &AppContext::onOpenWallet);
|
||||||
connect(wizard, &WalletWizard::defaultWalletDirChanged, m_windowSettings, &Settings::updatePaths);
|
connect(wizard, &WalletWizard::defaultWalletDirChanged, m_windowSettings, &Settings::updatePaths);
|
||||||
|
connect(wizard, &WalletWizard::rejected, [this]{
|
||||||
|
this->cleanupBeforeClose();
|
||||||
|
QCoreApplication::quit();
|
||||||
|
});
|
||||||
return wizard;
|
return wizard;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue