summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-09-17 10:45:06 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-09-17 10:45:06 -0300
commit357713b261ab7b48866713fa9111c95b94668eac (patch)
treec0f4770f63832689238aa2a0e11d4bb928e5361f
parent7de53cf242fb83718e511599e95300eadad16157 (diff)
parente68c3cb9f292e9d4dba3edec138ad30db9dab161 (diff)
Merge pull request #573 from marynate/PR-fix-get-data-dir
Make OS_Windows::get_data_dir return unix path
-rw-r--r--platform/windows/os_windows.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 5e57827c68..7f86f3bb98 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1835,7 +1835,7 @@ String OS_Windows::get_data_dir() const {
if (has_environment("APPDATA")) {
- return OS::get_singleton()->get_environment("APPDATA")+"\\"+an;
+ return (OS::get_singleton()->get_environment("APPDATA")+"\\"+an).replace("\\","/"); // windows path to unix path to be consistent with get_resource_path
}
}