+ if getcwd fails then use '.'

2016-05-11 09:24:29 +02:00 · 2016-05-11 09:24:29 +02:00 · d7d347b2d6
commit d7d347b2d6
parent f3a5deec5e
1 changed files with 2 additions and 3 deletions
--- 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;