highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-02 08:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #17444: wallet: Avoid showing GUI popups on RPC errors (take 2)

Browse Source 
faffa7f0dcc9971cb20534816eccdf75bebc853a wallet: Avoid showing GUI popups on RPC errors (take 2) (MarcoFalke)

Pull request description:

  Commit 8b0d82bb428de9e7f1da7c61574e7a8376a62d43 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 ACK faffa7f0dcc9971cb20534816eccdf75bebc853a

Tree-SHA512: 99987f80c76414dca40c7d76b2fe4ea853debbe3c49e7acdeab2596c726a2935c468f4484d49212e65ecc9c8b0d861c0c2b83c1ddfc07670540699199dbfecb0
This commit is contained in:
MarcoFalke 2019-11-20 16:53:15 -05:00
commit b7bc9b8330
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/wallet.cpp
View File

@ -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;
}
}