Skip to content

Commit ca8c228

Browse files
committed
Lua: fix nil reference in columns
1 parent 0f2ba39 commit ca8c228

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

ScaleformUI_Lua/src/Menus/PauseMenus/LobbyMenu/Columns/MissionListColumn.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ end
9898
---Adds a new player to the column.
9999
---@param item MissionItem
100100
function MissionListColumn:AddMissionItem(item)
101-
local pSubT = self.Parent()
102101
item.ParentColumn = self
103102
item.Handle = #self.Items + 1
104103
self.Items[item.Handle] = item
@@ -118,12 +117,14 @@ function MissionListColumn:AddMissionItem(item)
118117

119118
self.Pagination:MaxItem(self.Pagination:CurrentPageEndIndex())
120119
self:_itemCreation(self.Pagination:CurrentPage(), #self.Items, false)
120+
local pSubT = self.Parent()
121121
if pSubT == "PauseMenu" and self.ParentTab.Visible then
122122
if self.ParentTab.listCol[self.ParentTab:Focus()] == self then
123123
self:CurrentSelection(sel)
124124
end
125125
end
126126
end
127+
local pSubT = self.Parent()
127128
if pSubT == "LobbyMenu" then
128129
ScaleformUI.Scaleforms._pauseMenu._lobby:CallFunction("SET_MISSIONS_SELECTION", self.Pagination:ScaleformIndex()) --[[@as number]]
129130
ScaleformUI.Scaleforms._pauseMenu._lobby:CallFunction("SET_MISSIONS_QTTY", self:CurrentSelection(), #self.Items) --[[@as number]]

ScaleformUI_Lua/src/Menus/PauseMenus/LobbyMenu/Columns/PlayerListColumn.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ end
120120
---Adds a new player to the column.
121121
---@param item FriendItem
122122
function PlayerListColumn:AddPlayer(item)
123-
local pSubT = self.Parent()
124123
item.ParentColumn = self
125124
item.Handle = #self.Items + 1
126125
self.Items[item.Handle] = item
@@ -140,12 +139,14 @@ function PlayerListColumn:AddPlayer(item)
140139

141140
self.Pagination:MaxItem(self.Pagination:CurrentPageEndIndex())
142141
self:_itemCreation(self.Pagination:CurrentPage(), #self.Items, false)
142+
local pSubT = self.Parent()
143143
if pSubT == "PauseMenu" and self.ParentTab.Visible then
144144
if self.ParentTab.listCol[self.ParentTab:Focus()] == self then
145145
self:CurrentSelection(sel)
146146
end
147147
end
148148
end
149+
local pSubT = self.Parent()
149150
if pSubT == "LobbyMenu" then
150151
ScaleformUI.Scaleforms._pauseMenu._lobby:CallFunction("SET_PLAYERS_SELECTION", self.Pagination:ScaleformIndex()) --[[@as number]]
151152
ScaleformUI.Scaleforms._pauseMenu._lobby:CallFunction("SET_PLAYERS_QTTY", self:CurrentSelection(), #self.Items) --[[@as number]]

ScaleformUI_Lua/src/Menus/PauseMenus/LobbyMenu/Columns/SettingsListColumn.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ end
9292
---Add a new item to the column.
9393
---@param item UIMenuItem|UIMenuListItem|UIMenuCheckboxItem|UIMenuSliderItem|UIMenuProgressItem
9494
function SettingsListColumn:AddSettings(item)
95-
local pSubT = self.Parent()
9695
local a, b = item()
9796
if b == "UIMenuItem" then
9897
item.ParentColumn = self
@@ -116,12 +115,14 @@ function SettingsListColumn:AddSettings(item)
116115

117116
self.Pagination:MaxItem(self.Pagination:CurrentPageEndIndex())
118117
self:_itemCreation(self.Pagination:CurrentPage(), #self.Items, false)
118+
local pSubT = self.Parent()
119119
if pSubT == "PauseMenu" and self.ParentTab.Visible then
120120
if self.ParentTab.listCol[self.ParentTab:Focus()] == self then
121121
self:CurrentSelection(sel)
122122
end
123123
end
124124
end
125+
local pSubT = self.Parent()
125126
if pSubT == "LobbyMenu" then
126127
ScaleformUI.Scaleforms._pauseMenu._lobby:CallFunction("SET_SETTINGS_SELECTION", self.Pagination:ScaleformIndex()) --[[@as number]]
127128
ScaleformUI.Scaleforms._pauseMenu._lobby:CallFunction("SET_SETTINGS_QTTY", self:CurrentSelection(), #self.Items) --[[@as number]]

ScaleformUI_Lua/src/Menus/PauseMenus/LobbyMenu/Columns/StoreListColumn.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ end
9292
---Add a new item to the column.
9393
---@param item StoreItem
9494
function StoreListColumn:AddStoreItem(item)
95-
local pSubT = self.Parent()
9695
item.ParentColumn = self
9796
item.Handle = #self.Items + 1
9897
self.Items[#self.Items + 1] = item
@@ -112,12 +111,14 @@ function StoreListColumn:AddStoreItem(item)
112111

113112
self.Pagination:MaxItem(self.Pagination:CurrentPageEndIndex())
114113
self:_itemCreation(self.Pagination:CurrentPage(), #self.Items, false)
114+
local pSubT = self.Parent()
115115
if pSubT == "PauseMenu" and self.ParentTab.Visible then
116116
if self.ParentTab.listCol[self.ParentTab:Focus()] == self then
117117
self:CurrentSelection(sel)
118118
end
119119
end
120120
end
121+
local pSubT = self.Parent()
121122
if pSubT == "LobbyMenu" then
122123
ScaleformUI.Scaleforms._pauseMenu._lobby:CallFunction("SET_STORE_SELECTION", self.Pagination:ScaleformIndex()) --[[@as number]]
123124
ScaleformUI.Scaleforms._pauseMenu._lobby:CallFunction("SET_STORE_QTTY", self:CurrentSelection(), #self.Items) --[[@as number]]

0 commit comments

Comments
 (0)