diff options
| author | Ivan Metlushko <metlushko@gmail.com> | 2020-12-16 22:41:43 +0100 |
|---|---|---|
| committer | Ivan Metlushko <metlushko@gmail.com> | 2021-05-19 08:50:20 +0200 |
| commit | d73ae939649f3b30e52b5a2cccd7fafd1ab36766 (patch) | |
| tree | 3e18eda4f65cd0dd565c556fdb9e17a581e1a42b /src | |
| parent | 44c430ffac940e1d1dd7f5939a495470bc694489 (diff) | |
CWallet::Create move chain init message up into calling code
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/load.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/wallet/load.cpp b/src/wallet/load.cpp index 342a165f39..9a163ef556 100644 --- a/src/wallet/load.cpp +++ b/src/wallet/load.cpp @@ -105,6 +105,7 @@ bool LoadWallets(interfaces::Chain& chain) if (!database && status == DatabaseStatus::FAILED_NOT_FOUND) { continue; } + chain.initMessage(_("Loading wallet...").translated); std::shared_ptr<CWallet> pwallet = database ? CWallet::Create(chain, name, std::move(database), options.create_flags, error, warnings) : nullptr; if (!warnings.empty()) chain.initWarning(Join(warnings, Untranslated("\n"))); if (!pwallet) { diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index a6ba994361..01016e9bfc 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -213,6 +213,7 @@ std::shared_ptr<CWallet> LoadWalletInternal(interfaces::Chain& chain, const std: return nullptr; } + chain.initMessage(_("Loading wallet...").translated); std::shared_ptr<CWallet> wallet = CWallet::Create(chain, name, std::move(database), options.create_flags, error, warnings); if (!wallet) { error = Untranslated("Wallet loading failed.") + Untranslated(" ") + error; @@ -292,6 +293,7 @@ std::shared_ptr<CWallet> CreateWallet(interfaces::Chain& chain, const std::strin } // Make the wallet + chain.initMessage(_("Loading wallet...").translated); std::shared_ptr<CWallet> wallet = CWallet::Create(chain, name, std::move(database), wallet_creation_flags, error, warnings); if (!wallet) { error = Untranslated("Wallet creation failed.") + Untranslated(" ") + error; @@ -3887,8 +3889,6 @@ std::shared_ptr<CWallet> CWallet::Create(interfaces::Chain& chain, const std::st { const std::string& walletFile = database->Filename(); - chain.initMessage(_("Loading wallet…").translated); - int64_t nStart = GetTimeMillis(); // TODO: Can't use std::make_shared because we need a custom deleter but // should be possible to use std::allocate_shared. |