gui: Fix async open wallet call order
This commit is contained in:
1 parent
a094b54332
commit
a720a98301
2 files changed
+2
-1
No files matched your search
@@ -396,6 +396,8 @@ void BitcoinGUI::createActions()
|
|||||||
connect(activity, &OpenWalletActivity::opened, this, &BitcoinGUI::setCurrentWallet);
|
connect(activity, &OpenWalletActivity::opened, this, &BitcoinGUI::setCurrentWallet);
|
||||||
connect(activity, &OpenWalletActivity::finished, activity, &QObject::deleteLater);
|
connect(activity, &OpenWalletActivity::finished, activity, &QObject::deleteLater);
|
||||||
connect(activity, &OpenWalletActivity::finished, dialog, &QObject::deleteLater);
|
connect(activity, &OpenWalletActivity::finished, dialog, &QObject::deleteLater);
|
||||||
|
bool invoked = QMetaObject::invokeMethod(activity, "open");
|
||||||
|
assert(invoked);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -59,7 +59,6 @@ OpenWalletActivity* WalletController::openWallet(const std::string& name, QWidge
|
|||||||
{
|
{
|
||||||
OpenWalletActivity* activity = new OpenWalletActivity(this, name);
|
OpenWalletActivity* activity = new OpenWalletActivity(this, name);
|
||||||
activity->moveToThread(&m_activity_thread);
|
activity->moveToThread(&m_activity_thread);
|
||||||
QMetaObject::invokeMethod(activity, "open", Qt::QueuedConnection);
|
|
||||||
return activity;
|
return activity;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user