Skip to content

Commit e336f72

Browse files
authored
slighty better nil checks? (#9128)
1 parent 18f03ef commit e336f72

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/HeadlessWrapper.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ end
5151
function GetScreenScale()
5252
return 1
5353
end
54+
function GetDPIScaleOverridePercent()
55+
return 1
56+
end
57+
function SetDPIScaleOverridePercent(scale) end
5458
function SetClearColor(r, g, b, a) end
5559
function SetDrawLayer(layer, subLayer) end
5660
function SetViewport(x, y, width, height) end

src/Modules/Main.lua

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ function main:Init()
113113
self.showPublicBuilds = true
114114
self.showFlavourText = true
115115

116+
if not SetDPIScaleOverridePercent then SetDPIScaleOverridePercent = function(scale) end end
117+
116118
if self.userPath then
117119
self:ChangeUserPath(self.userPath, ignoreBuild)
118120
end
@@ -645,7 +647,7 @@ function main:LoadSettings(ignoreBuild)
645647
end
646648
if node.attrib.dpiScaleOverridePercent then
647649
self.dpiScaleOverridePercent = tonumber(node.attrib.dpiScaleOverridePercent) or 0
648-
if SetDPIScaleOverridePercent then SetDPIScaleOverridePercent(self.dpiScaleOverridePercent) end
650+
SetDPIScaleOverridePercent(self.dpiScaleOverridePercent)
649651
end
650652
end
651653
end
@@ -884,7 +886,7 @@ function main:OpenOptionsPopup()
884886
{ label = "250%", percent = 250 },
885887
}, function(index, value)
886888
self.dpiScaleOverridePercent = value.percent
887-
if SetDPIScaleOverridePercent then SetDPIScaleOverridePercent(value.percent) end
889+
SetDPIScaleOverridePercent(value.percent)
888890
end)
889891
controls.dpiScaleOverrideLabel = new("LabelControl", { "RIGHT", controls.dpiScaleOverride, "LEFT" }, { defaultLabelSpacingPx, 0, 0, 16 }, "^7UI scaling override:")
890892
controls.dpiScaleOverride.tooltipText = "Overrides Windows DPI scaling inside Path of Building.\nChoose a percentage between 100% and 250% or revert to the system default."
@@ -1102,7 +1104,7 @@ function main:OpenOptionsPopup()
11021104
if not launch.devMode then
11031105
main:SetManifestBranch(self.betaTest and "beta" or "master")
11041106
end
1105-
if SetDPIScaleOverridePercent then SetDPIScaleOverridePercent(self.dpiScaleOverridePercent) end
1107+
SetDPIScaleOverridePercent(self.dpiScaleOverridePercent)
11061108
main:ClosePopup()
11071109
main:SaveSettings()
11081110
end)
@@ -1131,7 +1133,7 @@ function main:OpenOptionsPopup()
11311133
self.showPublicBuilds = initialShowPublicBuilds
11321134
self.showFlavourText = initialShowFlavourText
11331135
self.dpiScaleOverridePercent = initialDpiScaleOverridePercent
1134-
if SetDPIScaleOverridePercent then SetDPIScaleOverridePercent(self.dpiScaleOverridePercent) end
1136+
SetDPIScaleOverridePercent(self.dpiScaleOverridePercent)
11351137
main:ClosePopup()
11361138
end)
11371139
nextRow(1.5)

0 commit comments

Comments
 (0)