From 3f66eea05eb04e02c0a4d2944ffe455cf0c756e3 Mon Sep 17 00:00:00 2001
From: Turanszki Janos <turanszkij@gmail.com>
Date: Sat, 11 Jul 2020 21:13:24 +0100
Subject: [PATCH] working directory fix

---
 WickedEngine/wiHelper.cpp  | 16 ++++++++--------
 WickedEngine/wiVersion.cpp |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WickedEngine/wiHelper.cpp b/WickedEngine/wiHelper.cpp
index 2b7e30af7..3953dd465 100644
--- a/WickedEngine/wiHelper.cpp
+++ b/WickedEngine/wiHelper.cpp
@@ -14,6 +14,7 @@
 #include <codecvt> // string conversion
 
 #ifdef _WIN32
+#include <direct.h>
 #ifdef PLATFORM_UWP
 #include <collection.h>
 #include <ppltasks.h>
@@ -212,18 +213,17 @@ namespace wiHelper
 		return appDir;
 	}
 
-#ifdef _WIN32
-#include <direct.h>
-	static std::string workingdir = std::string(_getcwd(NULL, 0)) + "/";
-#else
-	static std::string workingdir;
-#endif // _WIN32
-	static std::string __originalWorkingDir = workingdir;
 	string GetOriginalWorkingDirectory()
 	{
-		return __originalWorkingDir;
+#ifdef _WIN32
+		static std::string originalWorkingDir = std::string(_getcwd(NULL, 0)) + "/";
+#else
+		static std::string originalWorkingDir;
+#endif
+		return originalWorkingDir;
 	}
 
+	static std::string workingdir = GetOriginalWorkingDirectory();
 	string GetWorkingDirectory()
 	{
 		return workingdir;
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index cf4235a3b..2992c7427 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wiVersion
 	// minor features, major updates, breaking API changes
 	const int minor = 46;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 4;
+	const int revision = 5;
 
 	const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);