diff options
Diffstat (limited to 'contrib/epee/src')
| -rw-r--r-- | contrib/epee/src/string_tools.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/contrib/epee/src/string_tools.cpp b/contrib/epee/src/string_tools.cpp index 081cb9464..224cbe3b2 100644 --- a/contrib/epee/src/string_tools.cpp +++ b/contrib/epee/src/string_tools.cpp @@ -163,11 +163,15 @@ namespace string_tools void set_module_name_and_folder(const std::string& path_to_process_) { - boost::filesystem::path path_to_process = path_to_process_; + boost::filesystem::path path_to_process; #ifdef _WIN32 - path_to_process = get_current_module_path(); -#endif + // Convert to wide string to avoid codecvt errors with Unicode paths + std::wstring wpath = epee::string_tools::utf8_to_utf16(get_current_module_path()); + path_to_process = boost::filesystem::path(wpath); +#else + path_to_process = boost::filesystem::path(path_to_process_); +#endif get_current_module_name() = path_to_process.filename().string(); get_current_module_folder() = path_to_process.parent_path().string(); |