Merge pull request #1016 from peters/master

Set current directory.
Squirrel · Jun 2, 2017 · 6ea54c5 · 6ea54c5
2 parents e123ee9 + ebae62e
commit 6ea54c5
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/StubExecutable/StubExecutable.cpp b/src/StubExecutable/StubExecutable.cpp
@@ -93,8 +93,8 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	std::wstring appName;
 	appName.assign(FindOwnExecutableName());
 
-	std::wstring fullPath = FindLatestAppDir();
-	fullPath += L"\\" + appName;
+	std::wstring workingDir(FindLatestAppDir());
+	std::wstring fullPath(workingDir + L"\\" + appName);
 
 	STARTUPINFO si = { 0 };
 	PROCESS_INFORMATION pi = { 0 };
@@ -108,8 +108,9 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	cmdLine += L"\" ";
 	cmdLine += lpCmdLine;
 
-	wchar_t* buf = wcsdup(cmdLine.c_str());
-	if (!CreateProcess(NULL, buf, NULL, NULL, true, 0, NULL, NULL, &si, &pi)) {
+	wchar_t* lpCommandLine = wcsdup(cmdLine.c_str());
+	wchar_t* lpCurrentDirectory = wcsdup(workingDir.c_str());
+	if (!CreateProcess(NULL, lpCommandLine, NULL, NULL, true, 0, NULL, lpCurrentDirectory, &si, &pi)) {
 		return -1;
 	}