diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2018-06-19 21:33:13 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2018-06-19 21:33:13 +0200 |
| commit | 3a03d2a33fecdc9efc71d3d43ae4980e47e845fe (patch) | |
| tree | e0a8ca0c69ee9c3666e13752ffa9e9e0662ec57a /src/wallet | |
| parent | 3f398d7a17f136cd4a67998406ca41a124ae2966 (diff) | |
| download | bitcoin-3a03d2a33fecdc9efc71d3d43ae4980e47e845fe.tar.xz | |
Qt: load wallet in UI after possible init aborts
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 014a59ce2b..ca785298fd 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4095,8 +4095,6 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name, } } - uiInterface.LoadWallet(walletInstance); - int prev_version = walletInstance->nWalletVersion; if (gArgs.GetBoolArg("-upgradewallet", fFirstRun)) { @@ -4346,6 +4344,8 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name, } } + uiInterface.LoadWallet(walletInstance); + // Register with the validation interface. It's ok to do this after rescan since we're still holding cs_main. RegisterValidationInterface(walletInstance.get()); |