diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-10-21 09:40:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-21 09:40:18 -0400 |
| commit | ce2f945441155fa9d98935dabd6979304f2d2fbc (patch) | |
| tree | 5e6d6aa0d0071093f64987fb4e189668062aa312 /rootston/desktop.c | |
| parent | 17adb2621889284a2917f7a00a1dff2bc96c5b89 (diff) | |
| parent | f2c4b80620337e8533ce0986186cc914d45b6dce (diff) | |
Merge pull request #303 from emersion/wl-signal-no-list-init
Remove wl_list_init when using wl_signal_add
Diffstat (limited to 'rootston/desktop.c')
| -rw-r--r-- | rootston/desktop.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index 641315a8..70767f92 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -202,17 +202,23 @@ struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly, struct roots_desktop *desktop_create(struct roots_server *server, struct roots_config *config) { - struct roots_desktop *desktop = calloc(1, sizeof(struct roots_desktop)); wlr_log(L_DEBUG, "Initializing roots desktop"); - assert(desktop->views = list_create()); + struct roots_desktop *desktop = calloc(1, sizeof(struct roots_desktop)); + if (desktop == NULL) { + return NULL; + } + + desktop->views = list_create(); + if (desktop->views == NULL) { + free(desktop); + return NULL; + } wl_list_init(&desktop->outputs); - wl_list_init(&desktop->output_add.link); - desktop->output_add.notify = output_add_notify; - wl_list_init(&desktop->output_remove.link); - desktop->output_remove.notify = output_remove_notify; + desktop->output_add.notify = output_add_notify; wl_signal_add(&server->backend->events.output_add, &desktop->output_add); + desktop->output_remove.notify = output_remove_notify; wl_signal_add(&server->backend->events.output_remove, &desktop->output_remove); |