CMake: fix merged build, seems GCC could not handle the namespaces correctly

[lyx.git] / src / support / os_unix.cpp

diff --git a/src/support/os_unix.cpp b/src/support/os_unix.cpp
index ef13ff7f9ec69707afc6e2f8922ca3c2e5b88535..2e6f9ba309c84bc583b6b07ea1cf029f98034004 100644 (file)
--- a/src/support/os_unix.cpp
+++ b/src/support/os_unix.cpp
@@ -100,8 +100,13 @@ bool path_prefix_is(string & path, string const & pre, path_case how)
        if (common_len != p2_len)
                return false;
 
-       if (how == CASE_ADJUSTED && !prefixIs(path, pre))
-               path = to_utf8(p2 + p1.substr(common_len, p1_len - common_len));
+       if (how == CASE_ADJUSTED && !prefixIs(path, pre)) {
+               if (p1_len < common_len)
+                       path = to_utf8(p2.substr(0, p1_len));
+               else
+                       path = to_utf8(p2 + p1.substr(common_len,
+                                                       p1_len - common_len));
+       }
 
        return true;
 #else