highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-25 06:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Qt: load wallet in UI after possible init aborts

Browse Source
This commit is contained in:
Jonas Schnelli
2018-06-19 21:33:13 +02:00
parent 3f398d7a17
commit 3a03d2a33f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/wallet.cpp
View File

@@ -4095,8 +4095,6 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name,
} }
} }
uiInterface.LoadWallet(walletInstance);
int prev_version = walletInstance->nWalletVersion; int prev_version = walletInstance->nWalletVersion;
if (gArgs.GetBoolArg("-upgradewallet", fFirstRun)) 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. // Register with the validation interface. It's ok to do this after rescan since we're still holding cs_main.
RegisterValidationInterface(walletInstance.get()); RegisterValidationInterface(walletInstance.get());