mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Free the allocated display if we fail to setup libxkbcommon

Browse Source
This commit is contained in:
Rob Bradford
2013-07-26 16:29:43 +01:00
committed by Kristian Høgsberg
parent c48c34d6fa
commit 5ab9c75d59
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+7 -6
View File
@@ -4970,6 +4970,13 @@ display_create(int *argc, char *argv[])
return NULL; return NULL;
} }
d->xkb_context = xkb_context_new(0);
if (d->xkb_context == NULL) {
fprintf(stderr, "Failed to create XKB context\n");
free(d);
return NULL;
}
d->epoll_fd = os_epoll_create_cloexec(); d->epoll_fd = os_epoll_create_cloexec();
d->display_fd = wl_display_get_fd(d->display); d->display_fd = wl_display_get_fd(d->display);
d->display_task.run = handle_display_data; d->display_task.run = handle_display_data;
@@ -4981,12 +4988,6 @@ display_create(int *argc, char *argv[])
wl_list_init(&d->output_list); wl_list_init(&d->output_list);
wl_list_init(&d->global_list); wl_list_init(&d->global_list);
d->xkb_context = xkb_context_new(0);
if (d->xkb_context == NULL) {
fprintf(stderr, "Failed to create XKB context\n");
return NULL;
}
d->workspace = 0; d->workspace = 0;
d->workspace_count = 1; d->workspace_count = 1;