diff options
Diffstat (limited to 'rbutil/rbutilApp.cpp')
-rw-r--r-- | rbutil/rbutilApp.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/rbutil/rbutilApp.cpp b/rbutil/rbutilApp.cpp index 71e63884fb..a9101e2656 100644 --- a/rbutil/rbutilApp.cpp +++ b/rbutil/rbutilApp.cpp | |||
@@ -127,13 +127,15 @@ bool rbutilFrmApp::ReadGlobalConfig(rbutilFrm* myFrame) | |||
127 | // then in the user config dir (linux ~/) and | 127 | // then in the user config dir (linux ~/) and |
128 | // then config dir (linux /etc/ ) | 128 | // then config dir (linux /etc/ ) |
129 | 129 | ||
130 | buf.Printf(wxT("%s" PATH_SEP "rbutil.ini"), gv->AppDir.c_str() ); | 130 | buf = gv->AppDir + wxT("" PATH_SEP "rbutil.ini"); |
131 | if (! wxFileExists(buf) ) | 131 | if (! wxFileExists(buf) ) |
132 | { | 132 | { |
133 | buf.Printf(wxT("%s" PATH_SEP ".rbutil" PATH_SEP "rbutil.ini"), gv->stdpaths->GetUserConfigDir().c_str() ); | 133 | buf = gv->stdpaths->GetUserConfigDir() |
134 | + wxT("" PATH_SEP ".rbutil" PATH_SEP "rbutil.ini"); | ||
134 | if (! wxFileExists(buf) ) | 135 | if (! wxFileExists(buf) ) |
135 | { | 136 | { |
136 | buf.Printf(wxT("%s" PATH_SEP "rbutil.ini"), gv->stdpaths->GetConfigDir().c_str() ); | 137 | buf = gv->stdpaths->GetConfigDir() |
138 | + wxT("" PATH_SEP "rbutil.ini"); | ||
137 | } | 139 | } |
138 | } | 140 | } |
139 | 141 | ||
@@ -232,8 +234,7 @@ void rbutilFrmApp::ReadUserConfig() | |||
232 | { | 234 | { |
233 | wxString buf, str, stack; | 235 | wxString buf, str, stack; |
234 | 236 | ||
235 | buf.Printf(wxT("%s" PATH_SEP "RockboxUtility.cfg"), | 237 | buf = gv->AppDir + wxT("" PATH_SEP "RockboxUtility.cfg"); |
236 | gv->AppDir.c_str()); | ||
237 | 238 | ||
238 | if (wxFileExists(buf) ) | 239 | if (wxFileExists(buf) ) |
239 | { | 240 | { |
@@ -242,8 +243,8 @@ void rbutilFrmApp::ReadUserConfig() | |||
242 | else | 243 | else |
243 | { | 244 | { |
244 | gv->portable = false; | 245 | gv->portable = false; |
245 | buf.Printf(wxT("%s" PATH_SEP "%s"), | 246 | buf = gv->stdpaths->GetUserDataDir() |
246 | gv->stdpaths->GetUserDataDir().c_str(), wxT("RockboxUtility.cfg")); | 247 | + wxT("" PATH_SEP "RockboxUtility.cfg"); |
247 | } | 248 | } |
248 | 249 | ||
249 | gv->UserConfig = new wxFileConfig(wxEmptyString, wxEmptyString, buf); | 250 | gv->UserConfig = new wxFileConfig(wxEmptyString, wxEmptyString, buf); |