monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 16:28:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WalletManager: fix possible race

Browse source
This commit is contained in:
Jaquee 2017-01-30 18:22:59 +01:00
parent 9dbbd4c9bc
commit cb3281dee8
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libwalletqt/WalletManager.cpp
View file

@ -64,13 +64,14 @@ void WalletManager::openWalletAsync(const QString &path, const QString &password
QFuture<Wallet*> future = QtConcurrent::run(this, &WalletManager::openWallet,
path, password, testnet);
QFutureWatcher<Wallet*> * watcher = new QFutureWatcher<Wallet*>();
watcher->setFuture(future);
connect(watcher, &QFutureWatcher<Wallet*>::finished,
this, [this, watcher]() {
QFuture<Wallet*> future = watcher->future();
watcher->deleteLater();
emit walletOpened(future.result());
});
watcher->setFuture(future);
}
@ -121,7 +122,6 @@ void WalletManager::closeWalletAsync()
{
QFuture<QString> future = QtConcurrent::run(this, &WalletManager::closeWallet);
QFutureWatcher<QString> * watcher = new QFutureWatcher<QString>();
watcher->setFuture(future);
connect(watcher, &QFutureWatcher<QString>::finished,
this, [this, watcher]() {
@ -129,6 +129,7 @@ void WalletManager::closeWalletAsync()
watcher->deleteLater();
emit walletClosed(future.result());
});
watcher->setFuture(future);
}
bool WalletManager::walletExists(const QString &path) const