From 1077a5bad0af00bdd113552518eac791b58eeb9a Mon Sep 17 00:00:00 2001 From: Chris Bessent Date: Mon, 22 Nov 2021 16:13:20 -0700 Subject: Allow portable instances to set custom paths Fixes #1610 --- src/createinstancedialog.cpp | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'src/createinstancedialog.cpp') diff --git a/src/createinstancedialog.cpp b/src/createinstancedialog.cpp index 9f0edf96..e728aec1 100644 --- a/src/createinstancedialog.cpp +++ b/src/createinstancedialog.cpp @@ -341,28 +341,25 @@ void CreateInstanceDialog::finish() s.game().setEdition(ci.gameVariant); } - if (ci.type == Global) { - if (ci.paths.base != ci.dataPath) { - s.paths().setBase(ci.paths.base); - } - - if (ci.paths.downloads != cid::makeDefaultPath(AppConfig::downloadPath())) { - s.paths().setDownloads(ci.paths.downloads); - } + if (ci.paths.base != ci.dataPath) { + s.paths().setBase(ci.paths.base); + } - if (ci.paths.mods != cid::makeDefaultPath(AppConfig::modsPath())) { - s.paths().setMods(ci.paths.mods); - } + if (ci.paths.downloads != cid::makeDefaultPath(AppConfig::downloadPath())) { + s.paths().setDownloads(ci.paths.downloads); + } - if (ci.paths.profiles != cid::makeDefaultPath(AppConfig::profilesPath())) { - s.paths().setProfiles(ci.paths.profiles); - } + if (ci.paths.mods != cid::makeDefaultPath(AppConfig::modsPath())) { + s.paths().setMods(ci.paths.mods); + } - if (ci.paths.overwrite != cid::makeDefaultPath(AppConfig::overwritePath())) { - s.paths().setOverwrite(ci.paths.overwrite); - } + if (ci.paths.profiles != cid::makeDefaultPath(AppConfig::profilesPath())) { + s.paths().setProfiles(ci.paths.profiles); } + if (ci.paths.overwrite != cid::makeDefaultPath(AppConfig::overwritePath())) { + s.paths().setOverwrite(ci.paths.overwrite); + } logCreation(tr("Writing %1...").arg(ci.iniPath)); -- cgit v1.3.1