diff options
author | Dominique Martinet <asmadeus@codewreck.org> | 2020-03-29 09:53:52 +0200 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-03-29 11:17:32 +0200 |
commit | 484f7677b0d5e07eb0e42d70343c4951ac6f24cf (patch) | |
tree | 58dbae4ec3e461d41bf510cd7e791c6c9e3201ea | |
parent | sway.5: fix missing background scaling mode in a block example (diff) | |
download | sway-484f7677b0d5e07eb0e42d70343c4951ac6f24cf.tar.gz sway-484f7677b0d5e07eb0e42d70343c4951ac6f24cf.tar.zst sway-484f7677b0d5e07eb0e42d70343c4951ac6f24cf.zip |
swaynag: fix segfault on exit when arguments are not correct
swaynag_destroy is called on all cleanup cases and needs the lists to be valid,
just init them early
-rw-r--r-- | swaynag/main.c | 2 | ||||
-rw-r--r-- | swaynag/swaynag.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/swaynag/main.c b/swaynag/main.c index 542e3472..c8212415 100644 --- a/swaynag/main.c +++ b/swaynag/main.c | |||
@@ -27,6 +27,8 @@ int main(int argc, char **argv) { | |||
27 | 27 | ||
28 | memset(&swaynag, 0, sizeof(swaynag)); | 28 | memset(&swaynag, 0, sizeof(swaynag)); |
29 | swaynag.buttons = create_list(); | 29 | swaynag.buttons = create_list(); |
30 | wl_list_init(&swaynag.outputs); | ||
31 | wl_list_init(&swaynag.seats); | ||
30 | 32 | ||
31 | struct swaynag_button *button_close = | 33 | struct swaynag_button *button_close = |
32 | calloc(sizeof(struct swaynag_button), 1); | 34 | calloc(sizeof(struct swaynag_button), 1); |
diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c index e6fe9b21..06700e47 100644 --- a/swaynag/swaynag.c +++ b/swaynag/swaynag.c | |||
@@ -437,8 +437,6 @@ void swaynag_setup(struct swaynag *swaynag) { | |||
437 | } | 437 | } |
438 | 438 | ||
439 | swaynag->scale = 1; | 439 | swaynag->scale = 1; |
440 | wl_list_init(&swaynag->outputs); | ||
441 | wl_list_init(&swaynag->seats); | ||
442 | 440 | ||
443 | struct wl_registry *registry = wl_display_get_registry(swaynag->display); | 441 | struct wl_registry *registry = wl_display_get_registry(swaynag->display); |
444 | wl_registry_add_listener(registry, ®istry_listener, swaynag); | 442 | wl_registry_add_listener(registry, ®istry_listener, swaynag); |