diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-07-12 15:35:41 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-07-12 19:20:01 +0200 |
| commit | fa475e9c7977a952617738f2ee8cf600c07d4df8 (patch) | |
| tree | dc97023220ebccf7db7dd674b00c66cea2b69a5e /src/qt | |
| parent | fa8de09edc9ec4e6d171df80f746174a0ec58afb (diff) | |
| download | bitcoin-fa475e9c7977a952617738f2ee8cf600c07d4df8.tar.xz | |
refactor: Return BResult from restoreWallet
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/walletcontroller.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp index 11140c5da9..01d84624e8 100644 --- a/src/qt/walletcontroller.cpp +++ b/src/qt/walletcontroller.cpp @@ -391,9 +391,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); }); |