diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-13 17:30:23 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-13 17:30:27 +0200 |
commit | d73205ef3652e1ea58d9b90f3f397fdf2e6bd9fd (patch) | |
tree | 16ccdb4e8e05672b35ac556bef38c3cf6f935031 /src/wallet | |
parent | 49fd485bbf5b140e23b538c7c9355e33d7193b48 (diff) | |
parent | e2213689328f8ba42af1d32d12c7b78a71f1ddc7 (diff) |
Merge #14192: utils: Convert fs::filesystem_error messages from local multibyte to utf-8 on Windows
e2213689328f8ba42af1d32d12c7b78a71f1ddc7 utils: Convert fs error messages from multibyte to utf-8 (Chun Kuan Lee)
Pull request description:
Before:
![default](https://user-images.githubusercontent.com/11154118/45318798-8d83f480-b570-11e8-8cbb-c729a54f6b9e.png)
After:
![2](https://user-images.githubusercontent.com/11154118/45318806-91177b80-b570-11e8-9474-a62342c92dbd.png)
Tree-SHA512: 0a598bd159286f6784d117b8a24888b2650d5402d687ab0e8d0849e0c3d53797e266647d8177bb6614307c9598019cd7477311bb9895b1bb52a6bd77b460fda1
Diffstat (limited to 'src/wallet')
-rw-r--r-- | src/wallet/db.cpp | 2 | ||||
-rw-r--r-- | src/wallet/wallet.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index dfd60ae5eb..025ae29753 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -783,7 +783,7 @@ bool BerkeleyDatabase::Backup(const std::string& strDest) LogPrintf("copied %s to %s\n", strFile, pathDest.string()); return true; } catch (const fs::filesystem_error& e) { - LogPrintf("error copying %s to %s - %s\n", strFile, pathDest.string(), e.what()); + LogPrintf("error copying %s to %s - %s\n", strFile, pathDest.string(), fsbridge::get_filesystem_error_message(e)); return false; } } diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 593035eb78..f3d6d0056d 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3849,7 +3849,7 @@ bool CWallet::Verify(std::string wallet_file, bool salvage_wallet, std::string& return false; } } catch (const fs::filesystem_error& e) { - error_string = strprintf("Error loading wallet %s. %s", wallet_file, e.what()); + error_string = strprintf("Error loading wallet %s. %s", wallet_file, fsbridge::get_filesystem_error_message(e)); return false; } |