From a8157da9869df13b4beac4415515c6ae6fd67c8c Mon Sep 17 00:00:00 2001 From: Peechey Date: Mon, 15 Dec 2025 13:45:14 +0000 Subject: [PATCH 1/2] Apply changes from https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9349 --- src/Modules/Main.lua | 4 ++++ src/Modules/Main.lua.rej | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/Modules/Main.lua.rej diff --git a/src/Modules/Main.lua b/src/Modules/Main.lua index f1fb99310..c6b3105b5 100644 --- a/src/Modules/Main.lua +++ b/src/Modules/Main.lua @@ -139,6 +139,10 @@ function main:Init() self.tree = { } self:LoadTree(latestTreeVersion) + if self.userPath then + self:ChangeUserPath(self.userPath, ignoreBuild) + end + self.uniqueDB = { list = { }, loading = true } self.rareDB = { list = { }, loading = true } diff --git a/src/Modules/Main.lua.rej b/src/Modules/Main.lua.rej new file mode 100644 index 000000000..3f6e76824 --- /dev/null +++ b/src/Modules/Main.lua.rej @@ -0,0 +1,12 @@ +diff a/src/Modules/Main.lua b/src/Modules/Main.lua (rejected hunks) +@@ -118,10 +118,6 @@ function main:Init() + + if not SetDPIScaleOverridePercent then SetDPIScaleOverridePercent = function(scale) end end + +- if self.userPath then +- self:ChangeUserPath(self.userPath, ignoreBuild) +- end +- + if launch.devMode and IsKeyDown("CTRL") or os.getenv("REGENERATE_MOD_CACHE") == "1" then + -- If modLib.parseMod doesn't find a cache entry it generates it. + -- Not loading pre-generated cache causes it to be rebuilt From 17281ed24201e484c6e91b991560d72d8a9d0ec0 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Tue, 16 Dec 2025 02:06:41 +1100 Subject: [PATCH 2/2] Fix conflict --- src/Modules/Main.lua | 4 ---- src/Modules/Main.lua.rej | 12 ------------ 2 files changed, 16 deletions(-) delete mode 100644 src/Modules/Main.lua.rej diff --git a/src/Modules/Main.lua b/src/Modules/Main.lua index c6b3105b5..c10124f98 100644 --- a/src/Modules/Main.lua +++ b/src/Modules/Main.lua @@ -114,10 +114,6 @@ function main:Init() self.showAnimations = true self.errorReadingSettings = false - if self.userPath then - self:ChangeUserPath(self.userPath, ignoreBuild) - end - if launch.devMode and IsKeyDown("CTRL") or os.getenv("REGENERATE_MOD_CACHE") == "1" then -- If modLib.parseMod doesn't find a cache entry it generates it. -- Not loading pre-generated cache causes it to be rebuilt diff --git a/src/Modules/Main.lua.rej b/src/Modules/Main.lua.rej deleted file mode 100644 index 3f6e76824..000000000 --- a/src/Modules/Main.lua.rej +++ /dev/null @@ -1,12 +0,0 @@ -diff a/src/Modules/Main.lua b/src/Modules/Main.lua (rejected hunks) -@@ -118,10 +118,6 @@ function main:Init() - - if not SetDPIScaleOverridePercent then SetDPIScaleOverridePercent = function(scale) end end - -- if self.userPath then -- self:ChangeUserPath(self.userPath, ignoreBuild) -- end -- - if launch.devMode and IsKeyDown("CTRL") or os.getenv("REGENERATE_MOD_CACHE") == "1" then - -- If modLib.parseMod doesn't find a cache entry it generates it. - -- Not loading pre-generated cache causes it to be rebuilt