GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 062b9db0cc into merged_master (Bitcoin PR bitcoin/bitcoin#25594)

Browse source
This commit is contained in:
James Dorfman 2024-10-16 06:40:24 +00:00
commit 66071a5dbb
4 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/qt/walletcontroller.cpp
View file

@ -392,9 +392,10 @@ void RestoreWalletActivity::restore(const fs::path& backup_file, const std::stri
tr("Restoring Wallet <b>%1</b>…").arg(name.toHtmlEscaped()));
QTimer::singleShot(0, worker(), [this, backup_file, wallet_name] {
std::unique_ptr<interfaces::Wallet> wallet = node().walletLoader().restoreWallet(backup_file, wallet_name, m_error_message, m_warning_message);
auto wallet{node().walletLoader().restoreWallet(backup_file, wallet_name, m_warning_message)};
if (wallet) m_wallet_model = m_wallet_controller->getOrCreateWallet(std::move(wallet));
m_error_message = wallet ? bilingual_str{} : wallet.GetError();
if (wallet) m_wallet_model = m_wallet_controller->getOrCreateWallet(wallet.ReleaseObj());
QTimer::singleShot(0, this, &RestoreWalletActivity::finish);
});