From 2646f97fab05b7ac288af2717ffb4bf7a7f4c67d Mon Sep 17 00:00:00 2001 From: Malcolm MacLeod Date: Mon, 3 Oct 2022 16:24:34 +0200 Subject: [PATCH] CORE: Fix conf file rename when upgrading data dir --- src/unity/libinit.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/unity/libinit.cpp b/src/unity/libinit.cpp index f3e99d7e70..59f14b6126 100644 --- a/src/unity/libinit.cpp +++ b/src/unity/libinit.cpp @@ -167,10 +167,11 @@ int InitUnity() { try { fs::rename((oldPath / entry.path().filename()).string(), (GetDataDir() / entry.path().filename()).string() ); } catch(...) {} } - if (fs::exists(oldPath / "gulden.conf")) - fs::rename((oldPath / "gulden.conf").string(), (GetDataDir() / "munt.conf").string()); - if (fs::exists(oldPath / "Gulden.conf")) - fs::rename((oldPath / "Gulden.conf").string(), (GetDataDir() / "munt.conf").string()); + boost::filesystem::path newPath(newPathString); + if (fs::exists(GetDataDir() / "gulden.conf")) + fs::rename((GetDataDir() / "gulden.conf").string(), (GetDataDir() / "munt.conf").string()); + if (fs::exists(GetDataDir() / "Gulden.conf")) + fs::rename((GetDataDir() / "Gulden.conf").string(), (GetDataDir() / "munt.conf").string()); } else { @@ -185,10 +186,10 @@ int InitUnity() { try { fs::rename((oldPath / entry.path().filename()).string(), (GetDataDir() / entry.path().filename()).string() ); } catch(...) {} } - if (fs::exists(oldPath / "gulden.conf")) - fs::rename((oldPath / "gulden.conf").string(), (GetDataDir() / "munt.conf").string()); - if (fs::exists(oldPath / "Gulden.conf")) - fs::rename((oldPath / "Gulden.conf").string(), (GetDataDir() / "munt.conf").string()); + if (fs::exists(GetDataDir() / "gulden.conf")) + fs::rename((GetDataDir() / "gulden.conf").string(), (GetDataDir() / "munt.conf").string()); + if (fs::exists(GetDataDir() / "Gulden.conf")) + fs::rename((GetDataDir() / "Gulden.conf").string(), (GetDataDir() / "munt.conf").string()); } } }