ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from rkitover/master 

fix configuration directory on OSX
This commit is contained in:
DoctorWho11 2015-11-09 15:39:04 -05:00
parent 3fac31acb5 8b8f2f7a14
commit c3574c543c
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/ConfigManager.cpp
View File

@ -706,7 +706,7 @@ char* FindConfigFile(char *name)
void LoadConfigFile() void LoadConfigFile()
{ {
#ifndef _WIN32 #if !defined(_WIN32) && !defined(__APPLE__)
// Get home dir // Get home dir
char buf[1024]; char buf[1024];
struct stat s; struct stat s;
@ -734,7 +734,7 @@ void LoadConfigFile()
void SaveConfigFile() void SaveConfigFile()
{ {
#ifndef _WIN32 #if !defined(_WIN32) && !defined(__APPLE__)
// Get home dir // Get home dir
char buf[1024]; char buf[1024];
struct stat s; struct stat s;

28
src/wx/wxvbam.cpp
View File

@ -38,7 +38,9 @@ static void get_config_path(wxPathList &path, bool exists = true)
wxStandardPathsBase &stdp = wxStandardPaths::Get(); wxStandardPathsBase &stdp = wxStandardPaths::Get();
#define add_path(p) do { \ #define add_path(p) do { \
const wxString& s = stdp.p; \ const wxString& s = stdp.p; \
if((!exists || wxDirExists(s)) && wxIsWritable(s)) \ wxFileName parent = wxFileName::DirName(s + wxT("//..")); \
parent.MakeAbsolute(); \
if((wxDirExists(s) && wxIsWritable(s)) || ((!exists || !wxDirExists(s)) && parent.IsDirWritable())) \
path.Add(s); \ path.Add(s); \
} while(0) } while(0)
// NOTE: this does not support XDG (freedesktop.org) paths // NOTE: this does not support XDG (freedesktop.org) paths
@ -85,6 +87,23 @@ wxString wxvbamApp::GetConfigurationPath()
} }
} }
// if no config dir was found, search for writable parent to
// create it in in reverse order
if (data_path.empty())
{
for (int i = 0; i < config_path.size() ; i++)
{
wxFileName parent_dir = wxFileName::DirName(config_path[i] + wxT("//.."));
parent_dir.MakeAbsolute();
if (parent_dir.IsDirWritable())
{
data_path = config_path[i];
break;
}
}
}
return data_path; return data_path;
} }
@ -134,7 +153,7 @@ bool wxvbamApp::OnInit()
wxString cwd = wxGetCwd(); wxString cwd = wxGetCwd();
for (int i = 0; i < config_path.size(); i++) for (int i = 0; i < config_path.size(); i++)
if (wxSetWorkingDirectory(config_path[i])) if (wxDirExists(config_path[i]) && wxSetWorkingDirectory(config_path[i]))
{ {
// *.xr[cs] doesn't work (double the number of scans) // *.xr[cs] doesn't work (double the number of scans)
// 2.9 gives errors for no files found, so manual precheck needed // 2.9 gives errors for no files found, so manual precheck needed
@ -163,7 +182,7 @@ bool wxvbamApp::OnInit()
// this needs to be in a subdir to support other config as well // this needs to be in a subdir to support other config as well
// but subdir flag behaves differently 2.8 vs. 2.9. Oh well. // but subdir flag behaves differently 2.8 vs. 2.9. Oh well.
// NOTE: this does not support XDG (freedesktop.org) paths // NOTE: this does not support XDG (freedesktop.org) paths
#ifdef __WXMSW__ #if defined(__WXMSW__) || defined(__APPLE__)
wxFileName vbamconf(GetConfigurationPath(), _T("vbam.ini")); wxFileName vbamconf(GetConfigurationPath(), _T("vbam.ini"));
cfg = new wxFileConfig(wxT("vbam"), wxEmptyString, cfg = new wxFileConfig(wxT("vbam"), wxEmptyString,
vbamconf.GetFullPath(), vbamconf.GetFullPath(),
@ -197,8 +216,7 @@ bool wxvbamApp::OnInit()
// only the path part gets created // only the path part gets created
// note that 0777 is default (assumes umask will do og-w) // note that 0777 is default (assumes umask will do og-w)
s.Mkdir(0777, wxPATH_MKDIR_FULL); s.Mkdir(0777, wxPATH_MKDIR_FULL);
s = GetConfigurationPath(); s = wxFileName::DirName(GetConfigurationPath());
s.AppendDir(s.GetFullName());
s.Mkdir(0777, wxPATH_MKDIR_FULL); s.Mkdir(0777, wxPATH_MKDIR_FULL);
} }