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

MarcoFalke · MarcoFalke · commit b7bc9b833009 · 2019-11-20T16:53:18.000-05:00
faffa7f wallet: Avoid showing GUI popups on RPC errors (take 2) (MarcoFalke) Pull request description: Commit 8b0d82b 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 faffa7f Tree-SHA512: 99987f80c76414dca40c7d76b2fe4ea853debbe3c49e7acdeab2596c726a2935c468f4484d49212e65ecc9c8b0d861c0c2b83c1ddfc07670540699199dbfecb0
diff --git 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;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -3651,9 +3651,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,`
`3651`	`3651`	`}`
`3652`	`3652`
`3653`	`3653`	`if (auto spk_man = walletInstance->m_spk_man.get()) {`
`3654`		`- std::string error;`
`3655`	`3654`	`if (!spk_man->Upgrade(prev_version, error)) {`
`3656`		`- chain.initError(error);`
`3657`	`3655`	`return nullptr;`
`3658`	`3656`	`}`
`3659`	`3657`	`}`