|
|
|
@ -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());
|
|
|
|
|
|
|
|
|
|