diff options
| author | w0xlt <woltx@protonmail.com> | 2022-08-07 00:56:25 -0300 |
|---|---|---|
| committer | w0xlt <woltx@protonmail.com> | 2022-08-10 11:14:53 -0300 |
| commit | 07df6cda1468ed45ac227ac6f0169b040e5c0bf3 (patch) | |
| tree | b0073fd5987562d0dde83834552205709d2b7d63 /src/qt | |
| parent | a6fc293c0a1f27ba1e573bfa16fd76d5f58988b2 (diff) | |
| download | bitcoin-07df6cda1468ed45ac227ac6f0169b040e5c0bf3.tar.xz | |
wallet: Return `util::Result` from WalletLoader methods
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/walletcontroller.cpp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp index 6e07dc09a0..443941d3c4 100644 --- a/src/qt/walletcontroller.cpp +++ b/src/qt/walletcontroller.cpp @@ -262,9 +262,13 @@ void CreateWalletActivity::createWallet() } QTimer::singleShot(500ms, worker(), [this, name, flags] { - std::unique_ptr<interfaces::Wallet> wallet = node().walletLoader().createWallet(name, m_passphrase, flags, m_error_message, m_warning_message); + auto wallet{node().walletLoader().createWallet(name, m_passphrase, flags, m_warning_message)}; - if (wallet) m_wallet_model = m_wallet_controller->getOrCreateWallet(std::move(wallet)); + if (wallet) { + m_wallet_model = m_wallet_controller->getOrCreateWallet(std::move(*wallet)); + } else { + m_error_message = util::ErrorString(wallet); + } QTimer::singleShot(500ms, this, &CreateWalletActivity::finish); }); @@ -343,9 +347,13 @@ void OpenWalletActivity::open(const std::string& path) tr("Opening Wallet <b>%1</b>…").arg(name.toHtmlEscaped())); QTimer::singleShot(0, worker(), [this, path] { - std::unique_ptr<interfaces::Wallet> wallet = node().walletLoader().loadWallet(path, m_error_message, m_warning_message); + auto wallet{node().walletLoader().loadWallet(path, m_warning_message)}; - if (wallet) m_wallet_model = m_wallet_controller->getOrCreateWallet(std::move(wallet)); + if (wallet) { + m_wallet_model = m_wallet_controller->getOrCreateWallet(std::move(*wallet)); + } else { + m_error_message = util::ErrorString(wallet); + } QTimer::singleShot(0, this, &OpenWalletActivity::finish); }); @@ -393,8 +401,11 @@ void RestoreWalletActivity::restore(const fs::path& backup_file, const std::stri QTimer::singleShot(0, worker(), [this, backup_file, wallet_name] { auto wallet{node().walletLoader().restoreWallet(backup_file, wallet_name, m_warning_message)}; - m_error_message = util::ErrorString(wallet); - if (wallet) m_wallet_model = m_wallet_controller->getOrCreateWallet(std::move(*wallet)); + if (wallet) { + m_wallet_model = m_wallet_controller->getOrCreateWallet(std::move(*wallet)); + } else { + m_error_message = util::ErrorString(wallet); + } QTimer::singleShot(0, this, &RestoreWalletActivity::finish); }); |