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

wx: only rename config if new file doesn't exist 

Before trying to rename `vbam.conf` to `vbam.ini`, as we decided during
the XDG support work, first check if `vbam.ini` does not already exist.

If it already exists, use `vbam.ini` and do nothing with the
`vbam.conf`.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2019-04-28 12:35:27 +00:00
parent 0a95486fd8
commit 504597120f
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wx/wxvbam.cpp
View File

@ -260,17 +260,13 @@ bool wxvbamApp::OnInit()
// /MIGRATION // /MIGRATION
// migrate from 'vbam.{cfg,conf}' to 'vbam.ini' to manage a single config // migrate from 'vbam.{cfg,conf}' to 'vbam.ini' to manage a single config
// file for all platforms. // file for all platforms.
#if !defined(__WXMSW__) && !defined(__APPLE__)
wxString oldConf(GetConfigurationPath() + wxT(FILE_SEP) + wxT("vbam.conf")); wxString oldConf(GetConfigurationPath() + wxT(FILE_SEP) + wxT("vbam.conf"));
#else
wxString oldConf(GetConfigurationPath() + wxT(FILE_SEP) + wxT("vbam.cfg"));
#endif
wxString newConf(GetConfigurationPath() + wxT(FILE_SEP) + wxT("vbam.ini")); wxString newConf(GetConfigurationPath() + wxT(FILE_SEP) + wxT("vbam.ini"));
if (wxFileExists(oldConf))
{ if (!wxFileExists(newConf) && wxFileExists(oldConf))
wxRenameFile(oldConf, newConf, false); wxRenameFile(oldConf, newConf, false);
}
// /END_MIGRATION // /END_MIGRATION
cfg = new wxFileConfig(wxT("vbam"), wxEmptyString, cfg = new wxFileConfig(wxT("vbam"), wxEmptyString,
vbamconf.GetFullPath(), vbamconf.GetFullPath(),
wxEmptyString, wxCONFIG_USE_LOCAL_FILE); wxEmptyString, wxCONFIG_USE_LOCAL_FILE);