mirror of
https://github.com/swaywm/sway.git
synced 2024-11-14 06:24:20 +01:00
Assert output is found before removing from list
References: https://github.com/swaywm/sway/issues/5483
(cherry picked from commit 9bb70283e9
)
This commit is contained in:
parent
773e745f52
commit
863b9c8ad9
@ -251,6 +251,11 @@ void output_disable(struct sway_output *output) {
|
||||
if (!sway_assert(output->enabled, "Expected an enabled output")) {
|
||||
return;
|
||||
}
|
||||
int index = list_find(root->outputs, output);
|
||||
if (!sway_assert(index >= 0, "Output not found in root node")) {
|
||||
return;
|
||||
}
|
||||
|
||||
sway_log(SWAY_DEBUG, "Disabling output '%s'", output->wlr_output->name);
|
||||
wl_signal_emit(&output->events.destroy, output);
|
||||
|
||||
@ -258,7 +263,6 @@ void output_disable(struct sway_output *output) {
|
||||
|
||||
root_for_each_container(untrack_output, output);
|
||||
|
||||
int index = list_find(root->outputs, output);
|
||||
list_del(root->outputs, index);
|
||||
|
||||
output->enabled = false;
|
||||
|
Loading…
Reference in New Issue
Block a user