Merge #17444: wallet: Avoid showing GUI popups on RPC errors (take 2)
faffa7f0dc
wallet: Avoid showing GUI popups on RPC errors (take 2) (MarcoFalke) Pull request description: Commit8b0d82bb42
claims "This commit does not change behavior." However, it re-introduced the bug I tried to fix in #17070 ACKs for top commit: ryanofsky: Code review ACKfaffa7f0dc
Tree-SHA512: 99987f80c76414dca40c7d76b2fe4ea853debbe3c49e7acdeab2596c726a2935c468f4484d49212e65ecc9c8b0d861c0c2b83c1ddfc07670540699199dbfecb0
This commit is contained in:
commit
b7bc9b8330
|
@ -3651,9 +3651,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
|
|||
}
|
||||
|
||||
if (auto spk_man = walletInstance->m_spk_man.get()) {
|
||||
std::string error;
|
||||
if (!spk_man->Upgrade(prev_version, error)) {
|
||||
chain.initError(error);
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue