mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 20:12:57 +01:00
Fix crash on splash screen when wallet fails to load (#3629)
This commit is contained in:
parent
b7b207d7ad
commit
469771d28e
@ -4197,8 +4197,6 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)
|
||||
if (nLoadWalletRet != DBErrors::LOAD_OK)
|
||||
return nLoadWalletRet;
|
||||
|
||||
uiInterface.LoadWallet(this);
|
||||
|
||||
return DBErrors::LOAD_OK;
|
||||
}
|
||||
|
||||
@ -5253,6 +5251,7 @@ CWallet* CWallet::CreateWalletFromFile(const std::string& name, const fs::path&
|
||||
InitError(_("Failed to rescan the wallet during initialization"));
|
||||
return nullptr;
|
||||
}
|
||||
uiInterface.LoadWallet(walletInstance); // TODO: move it up when backporting 13063
|
||||
walletInstance->ScanForWalletTransactions(pindexRescan, nullptr, reserver, true);
|
||||
}
|
||||
LogPrintf(" rescan %15dms\n", GetTimeMillis() - nStart);
|
||||
|
Loading…
Reference in New Issue
Block a user