mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-10 20:44:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

swaynag: sway_abort on failure to properly register

Browse Source 
In case `wl_display_roundtrip` returns an error after registering for
events, print a more user-friendly error message and exit.

Previously, if the build did not have assertions enabled, this would
likely result in a segfault. With assertions enabled, it's not user
friendly to terminate with internal implementation information.
This commit is contained in:
Luke Drummond 2020-06-10 01:13:21 +01:00 committed by Simon Ser
parent ed08f2f20c
commit 62a530513c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swaynag/swaynag.c
View File

@ -445,7 +445,10 @@ void swaynag_setup(struct swaynag *swaynag) {
struct wl_registry *registry = wl_display_get_registry(swaynag->display); struct wl_registry *registry = wl_display_get_registry(swaynag->display);
wl_registry_add_listener(registry, &registry_listener, swaynag); wl_registry_add_listener(registry, &registry_listener, swaynag);
wl_display_roundtrip(swaynag->display); if (wl_display_roundtrip(swaynag->display) < 0) {
sway_abort("failed to register with the wayland display");
}
assert(swaynag->compositor && swaynag->layer_shell && swaynag->shm); assert(swaynag->compositor && swaynag->layer_shell && swaynag->shm);
while (swaynag->querying_outputs > 0) { while (swaynag->querying_outputs > 0) {