Merge #13876: wallet: Catch filesystem_error and raise InitError
fa8527ffec
wallet: Catch filesystem_error and raise InitError (MarcoFalke)
Pull request description:
Fixes #13754 by restoring the previous behaviour
Tree-SHA512: f64052e89f6b332be395df2a5ea6f227c213fa2f38e415e83f30a4fad0938e947e5cddff7902368a43c07be135955a31b90f7eac5a46875c58d54ea95f87f6e6
This commit is contained in:
commit
8eb9870052
1 changed files with 6 additions and 1 deletions
|
@ -3982,9 +3982,14 @@ bool CWallet::Verify(std::string wallet_file, bool salvage_wallet, std::string&
|
|||
}
|
||||
}
|
||||
|
||||
try {
|
||||
if (!WalletBatch::VerifyEnvironment(wallet_path, error_string)) {
|
||||
return false;
|
||||
}
|
||||
} catch (const fs::filesystem_error& e) {
|
||||
error_string = strprintf("Error loading wallet %s. %s", wallet_file, e.what());
|
||||
return false;
|
||||
}
|
||||
|
||||
if (salvage_wallet) {
|
||||
// Recover readable keypairs:
|
||||
|
|
Loading…
Reference in a new issue