Skip to content

[pob2-port] Fix errorneous call to GetUserPath and update pop-up message #9082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 30, 2025
Merged

[pob2-port] Fix errorneous call to GetUserPath and update pop-up message #9082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18c79df
Apply changes from https://github.com/PathOfBuildingCommunity/PathOfB…
Wires77 Oct 30, 2025
f729e41
Fix conflicts
Wires77 Oct 30, 2025
cfbb6ca
Fix merge conflict
Wires77 Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/Modules/Main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ function main:Init()
-- If running in dev mode or standalone mode, put user data in the script path
self.userPath = GetScriptPath().."/"
else
local invalidPath
self.userPath, invalidPath = GetUserPath()
local invalidPath, errMsg
self.userPath, invalidPath, errMsg = GetUserPath()
if not self.userPath then
self:OpenPathPopup(invalidPath, ignoreBuild)
self:OpenPathPopup(invalidPath, errMsg, ignoreBuild)
else
self.userPath = self.userPath.."/Path of Building/"
end
Expand Down Expand Up @@ -769,17 +769,16 @@ function main:SaveSettings()
end
end

function main:OpenPathPopup(invalidPath, ignoreBuild)
function main:OpenPathPopup(invalidPath, errMsg, ignoreBuild)
local controls = { }
local defaultLabelPlacementX = 8

controls.label = new("LabelControl", { "TOPLEFT", nil, "TOPLEFT" }, { defaultLabelPlacementX, 20, 206, 16 }, function()
return "^7User settings path contains unicode characters and cannot be loaded."..
return "^7User settings path cannot be loaded: ".. errMsg ..
"\nCurrent Path: "..invalidPath:gsub("?", "^1?^7").."/Path of Building/"..
"\nSpecify a new location for your Settings.xml:"
end)
controls.explainButton = new("ButtonControl", { "LEFT", controls.label, "RIGHT" }, { 4, 0, 20, 20 }, "?", function()
OpenURL("https://github.com/PathOfBuildingCommunity/PathOfBuilding/wiki/Why-do-I-have-to-change-my-Settings-path%3F")
"\nIf this location is managed by OneDrive, navigate to that folder and manually try" ..
"\nto open Settings.xml in a text editor before re-opening Path of Building" ..
"\nOtherwise, specify a new location for your Settings.xml:"
end)
controls.userPath = new("EditControl", { "TOPLEFT", controls.label, "TOPLEFT" }, { 0, 60, 206, 20 }, invalidPath, nil, nil, nil, function(buf)
invalidPath = sanitiseText(buf)
Expand Down
6 changes: 4 additions & 2 deletions src/UpdateCheck.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@ end
ConPrintf("Checking for update...")

-- Use built-in helpers to obtain absolute paths without spawning a shell.
local scriptPath = (GetScriptPath and GetScriptPath()) or "."
local runtimePath = (GetRuntimePath and GetRuntimePath()) or scriptPath
local scriptPath, scriptFallback = GetScriptPath()
scriptPath = scriptPath or scriptFallback or "."
local runtimePath, runtimeFallback = GetRuntimePath()
runtimePath = runtimePath or runtimeFallback or scriptPath

-- Load and process local manifest
local localVer
Expand Down
Loading