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

swaylock: Fix crash when unable to connect to sway
This commit is contained in:
Drew DeVault 2016-03-23 09:44:22 -04:00
commit 686530d5e8

View file

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