summaryrefslogtreecommitdiff
path: root/src/common/file_util.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/common/file_util.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 740310807..d8812837e 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -525,7 +525,7 @@ void CopyDir(const std::string& source_path, const std::string& dest_path) {
525#endif 525#endif
526} 526}
527 527
528std::string GetCurrentDir() { 528std::optional<std::string> GetCurrentDir() {
529// Get the current working directory (getcwd uses malloc) 529// Get the current working directory (getcwd uses malloc)
530#ifdef _WIN32 530#ifdef _WIN32
531 wchar_t* dir; 531 wchar_t* dir;
@@ -535,7 +535,7 @@ std::string GetCurrentDir() {
535 if (!(dir = getcwd(nullptr, 0))) { 535 if (!(dir = getcwd(nullptr, 0))) {
536#endif 536#endif
537 LOG_ERROR(Common_Filesystem, "GetCurrentDirectory failed: {}", GetLastErrorMsg()); 537 LOG_ERROR(Common_Filesystem, "GetCurrentDirectory failed: {}", GetLastErrorMsg());
538 return nullptr; 538 return {};
539 } 539 }
540#ifdef _WIN32 540#ifdef _WIN32
541 std::string strDir = Common::UTF16ToUTF8(dir); 541 std::string strDir = Common::UTF16ToUTF8(dir);