Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

screen_refresh: Protect against globalconf.screens changing 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2017-11-19 15:53:07 +01:00
parent ea413969f3
commit c51a2c2f47
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
objects/screen.c
View File

@ -640,6 +640,7 @@ screen_refresh(void)
globalconf.screen_need_refresh = false; globalconf.screen_need_refresh = false;
screen_array_t new_screens; screen_array_t new_screens;
screen_array_t removed_screens;
lua_State *L = globalconf_get_lua_State(); lua_State *L = globalconf_get_lua_State();
bool list_changed = false; bool list_changed = false;
@ -669,6 +670,7 @@ screen_refresh(void)
} }
/* Remove screens which are gone */ /* Remove screens which are gone */
screen_array_init(&removed_screens);
for(int i = 0; i < globalconf.screens.len; i++) { for(int i = 0; i < globalconf.screens.len; i++) {
screen_t *old_screen = globalconf.screens.tab[i]; screen_t *old_screen = globalconf.screens.tab[i];
bool found = false; bool found = false;
@ -678,15 +680,18 @@ screen_refresh(void)
screen_array_take(&globalconf.screens, i); screen_array_take(&globalconf.screens, i);
i--; i--;
luaA_object_push(L, old_screen); screen_array_append(&removed_screens, old_screen);
screen_removed(L, -1);
lua_pop(L, 1);
luaA_object_unref(L, old_screen);
old_screen->valid = false;
list_changed = true; list_changed = true;
} }
} }
foreach(old_screen, removed_screens) {
luaA_object_push(L, *old_screen);
screen_removed(L, -1);
lua_pop(L, 1);
(*old_screen)->valid = false;
luaA_object_unref(L, *old_screen);
}
screen_array_wipe(&removed_screens);
/* Update changed screens */ /* Update changed screens */
foreach(existing_screen, globalconf.screens) foreach(existing_screen, globalconf.screens)