alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #535 from mikkeloscar/fix-swaylock-crash

Browse source 
swaylock: Fix crash when unable to connect to sway
This commit is contained in:
Drew DeVault 2016-03-23 09:44:22 -04:00
parent a99970d7a3 a8f989c651
commit 686530d5e8
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
swaylock/main.c
View file

@ -31,7 +31,9 @@ void sway_terminate(int exit_code) {
window_teardown(window); window_teardown(window);
} }
list_free(surfaces); list_free(surfaces);
registry_teardown(registry); if (registry) {
registry_teardown(registry);
}
exit(exit_code); exit(exit_code);
} }
@ -292,6 +294,10 @@ int main(int argc, char **argv) {
surfaces = create_list(); surfaces = create_list();
registry = registry_poll(); registry = registry_poll();
if (!registry) {
sway_abort("Unable to connect to wayland compositor");
}
if (!registry->swaylock) { if (!registry->swaylock) {
sway_abort("swaylock requires the compositor to support the swaylock extension."); sway_abort("swaylock requires the compositor to support the swaylock extension.");
} }