diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-11-20 16:53:15 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-11-20 16:53:18 -0500 |
| commit | b7bc9b8330096d1f4f1fa563b855b88da425226e (patch) | |
| tree | e328e0cf774b251c0e73a938d1aafc5d5555813e /src | |
| parent | 41162c0ba0a1aab8110ad65c4035c7087dce0f84 (diff) | |
| parent | faffa7f0dcc9971cb20534816eccdf75bebc853a (diff) | |
| download | bitcoin-b7bc9b8330096d1f4f1fa563b855b88da425226e.tar.xz | |
Merge #17444: wallet: Avoid showing GUI popups on RPC errors (take 2)
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 2f2931cef1..ff182c847f 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -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; } } |