From 4ecfd41e36533d858c98d051ef70cab80e69e972 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:00:50 +0200
Subject: 2.3

---
 shared/standardPaths.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'shared/standardPaths.cpp')

diff --git a/shared/standardPaths.cpp b/shared/standardPaths.cpp
index 0c333598..54774673 100644
--- a/shared/standardPaths.cpp
+++ b/shared/standardPaths.cpp
@@ -1,15 +1,15 @@
 #include "standardPaths.h"
 #include <wx/stdpaths.h>
-#include "globalFunctions.h"
 #include <wx/filename.h>
+#include "systemConstants.h"
 
 
 wxString assembleFileForUserData(const wxString fileName)
 {
     static const bool isPortableVersion = !wxFileExists(FreeFileSync::getInstallationDir() + globalFunctions::FILE_NAME_SEPARATOR + wxT("uninstall.exe")); //this check is a bit lame...
 
-    if (isPortableVersion) //use same directory as executable
-        return FreeFileSync::getInstallationDir() + globalFunctions::FILE_NAME_SEPARATOR + fileName;
+    if (isPortableVersion) //use current working directory
+        return wxString(wxT(".")) + globalFunctions::FILE_NAME_SEPARATOR + fileName;
     else //usen OS' standard paths
     {
         wxString userDirectory = wxStandardPathsBase::Get().GetUserDataDir();
-- 
cgit