Skip to content

fix nil index if there are no siege engines on the map (fixes #5751) #1602

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

Open
chdoc wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −3
Open

fix nil index if there are no siege engines on the map (fixes #5751) #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ Template for new versions:

## Fixes

- `gui/siegemanager`: fix nil index if there are no siege engines on the map

## Misc Improvements

## Removed
Expand Down
16 changes: 13 additions & 3 deletions gui/siegemanager.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ end
function SiegeEngineList:set_selected_action(action)
local _, selected = self.subviews.list:getSelected()

local successful = set_siege_engine_action({selected.data}, action)
local successful = selected and set_siege_engine_action({selected.data}, action)
if not successful then
self:refresh_view(true)
return
Expand Down Expand Up @@ -464,6 +464,10 @@ function SiegeEngineList:onInput(keys)
self:set_selected_action(action)
end

function SiegeEngineList:empty()
return not self.subviews.list:getSelected()
end

-- SiegeManager
SiegeManager = defclass(SiegeManager, widgets.Window)
SiegeManager.ATTRS = {
Expand Down Expand Up @@ -503,7 +507,10 @@ function SiegeManager:init()
frame={b=0},
key='CUSTOM_CTRL_C',
label='Reveal in World',
on_activate=self:callback('reveal_selected')
on_activate=self:callback('reveal_selected'),
enabled = function ()
return not self.subviews.list:empty()
end
},
})

Expand All @@ -514,7 +521,10 @@ function SiegeManager:init()
key = action_button_keybinds[i],
key_sep = i == #action_button_order and ': ' or '',
label = i == #action_button_order and 'Set Action' or '',
on_activate = self:callback('set_action', action_button)
on_activate = self:callback('set_action', action_button),
enabled = function ()
return not self.subviews.list:empty()
end
}
})
end
Expand Down
Loading