From d7d347b2d62ec685840e7db1c35863e659148981 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 11 May 2016 09:24:29 +0200 Subject: [PATCH] + if getcwd fails then use '.' --- src/Base/FileInfo.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Base/FileInfo.cpp b/src/Base/FileInfo.cpp index 3ba8d6958..afff7dd17 100644 --- a/src/Base/FileInfo.cpp +++ b/src/Base/FileInfo.cpp @@ -233,14 +233,13 @@ std::string FileInfo::dirPath () const } else { #ifdef FC_OS_WIN32 - wchar_t buf[MAX_PATH]; + wchar_t buf[MAX_PATH+1]; GetCurrentDirectoryW(MAX_PATH, buf); retval = std::string(ConvertFromWideString(std::wstring(buf))); #else char buf[PATH_MAX+1]; const char* cwd = getcwd(buf, PATH_MAX); - if (cwd) - retval = std::string(cwd); + retval = std::string(cwd ? cwd : "."); #endif } return retval;