diff options
| author | John Newbery <[email protected]> | 2017-07-28 06:03:03 -0400 |
|---|---|---|
| committer | João Barbosa <[email protected]> | 2017-07-28 11:25:38 +0100 |
| commit | d84e78ec393049cb067170a4905a1679ff794368 (patch) | |
| tree | c51cb8511a1a658503de6796f497a5112be73f8c /src | |
| parent | Reject invalid wallet files (diff) | |
| download | discoin-d84e78ec393049cb067170a4905a1679ff794368.tar.xz discoin-d84e78ec393049cb067170a4905a1679ff794368.zip | |
[wallet] Specify wallet name in wallet loading errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index ef1d76414..36c295e5d 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -473,21 +473,21 @@ bool CWallet::Verify() for (const std::string& walletFile : gArgs.GetArgs("-wallet")) { if (boost::filesystem::path(walletFile).filename() != walletFile) { - return InitError(_("-wallet parameter must only specify a filename (not a path)")); + return InitError(strprintf(_("Error loading wallet %s. -wallet parameter must only specify a filename (not a path)."), walletFile)); } if (SanitizeString(walletFile, SAFE_CHARS_FILENAME) != walletFile) { - return InitError(_("Invalid characters in -wallet filename")); + return InitError(strprintf(_("Error loading wallet %s. Invalid characters in -wallet filename."), walletFile)); } fs::path wallet_path = fs::absolute(walletFile, GetDataDir()); if (fs::exists(wallet_path) && (!fs::is_regular_file(wallet_path) || fs::is_symlink(wallet_path))) { - return InitError(_("Invalid -wallet file")); + return InitError(strprintf(_("Error loading wallet %s. -wallet filename must be a regular file."), walletFile)); } if (!wallet_paths.insert(wallet_path).second) { - return InitError(_("Duplicate -wallet filename")); + return InitError(strprintf(_("Error loading wallet %s. Duplicate -wallet filename specified."), walletFile)); } std::string strError; |