From 504597120f98d51b9c07ccbdeaaded79b13fec27 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Sun, 28 Apr 2019 12:35:27 +0000 Subject: [PATCH] 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 --- src/wx/wxvbam.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/wx/wxvbam.cpp b/src/wx/wxvbam.cpp index 0efee6f3..084ccc84 100644 --- a/src/wx/wxvbam.cpp +++ b/src/wx/wxvbam.cpp @@ -260,17 +260,13 @@ bool wxvbamApp::OnInit() // /MIGRATION // migrate from 'vbam.{cfg,conf}' to 'vbam.ini' to manage a single config // file for all platforms. -#if !defined(__WXMSW__) && !defined(__APPLE__) 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")); - if (wxFileExists(oldConf)) - { - wxRenameFile(oldConf, newConf, false); - } + + if (!wxFileExists(newConf) && wxFileExists(oldConf)) + wxRenameFile(oldConf, newConf, false); // /END_MIGRATION + cfg = new wxFileConfig(wxT("vbam"), wxEmptyString, vbamconf.GetFullPath(), wxEmptyString, wxCONFIG_USE_LOCAL_FILE);