summaryrefslogtreecommitdiff
path: root/lib/ffs_paths.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:28:01 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:28:01 +0200
commitfe9eb89ebc1b3c33cbac00a3fa095a14faef9113 (patch)
tree8a3bb620a9acb83fe0057061a86e8f2cb91a9fe1 /lib/ffs_paths.cpp
parent5.21 (diff)
downloadFreeFileSync-fe9eb89ebc1b3c33cbac00a3fa095a14faef9113.tar.gz
FreeFileSync-fe9eb89ebc1b3c33cbac00a3fa095a14faef9113.tar.bz2
FreeFileSync-fe9eb89ebc1b3c33cbac00a3fa095a14faef9113.zip
5.22
Diffstat (limited to 'lib/ffs_paths.cpp')
-rw-r--r--lib/ffs_paths.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/ffs_paths.cpp b/lib/ffs_paths.cpp
index 0f01b8d1..5c775d3e 100644
--- a/lib/ffs_paths.cpp
+++ b/lib/ffs_paths.cpp
@@ -7,6 +7,7 @@
#include "ffs_paths.h"
#include <zen/file_handling.h>
#include <wx/stdpaths.h>
+#include <wx/app.h>
#include <wx+/string_conv.h>
#ifdef ZEN_MAC
@@ -61,6 +62,11 @@ bool zen::manualProgramUpdateRequired()
Zstring zen::getResourceDir()
{
+ //make independent from wxWidgets global variable "appname"; support being called by RealtimeSync
+ auto appName = wxTheApp->GetAppName();
+ wxTheApp->SetAppName(L"FreeFileSync");
+ ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName));
+
#ifdef ZEN_WIN
return getInstallDir();
#elif defined ZEN_LINUX
@@ -76,6 +82,11 @@ Zstring zen::getResourceDir()
Zstring zen::getConfigDir()
{
+ //make independent from wxWidgets global variable "appname"; support being called by RealtimeSync
+ auto appName = wxTheApp->GetAppName();
+ wxTheApp->SetAppName(L"FreeFileSync");
+ ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName));
+
#ifdef ZEN_WIN
if (isPortableVersion())
return getInstallDir();
bgstack15