summaryrefslogtreecommitdiffstats
path: root/swaylock
diff options
context:
space:
mode:
authorLibravatar Ian Fan <ianfan0@gmail.com>2018-10-22 09:59:35 +0100
committerLibravatar Ian Fan <ianfan0@gmail.com>2018-10-23 11:41:45 +0100
commit7fffe0a98cfd098393d3c288f228991b3ebac7f1 (patch)
treefc03f22ae7cb8a8c0028637fb2a85eb8d0d25371 /swaylock
parentMerge pull request #2941 from ianyfan/commands (diff)
downloadsway-7fffe0a98cfd098393d3c288f228991b3ebac7f1.tar.gz
sway-7fffe0a98cfd098393d3c288f228991b3ebac7f1.tar.zst
sway-7fffe0a98cfd098393d3c288f228991b3ebac7f1.zip
swaylock: exit early if unable to inhibit input
This stops the program from going into a spinlock without exiting
Diffstat (limited to 'swaylock')
-rw-r--r--swaylock/main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/swaylock/main.c b/swaylock/main.c
index f2bb5c3e..8ed8adf5 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -925,6 +925,11 @@ int main(int argc, char **argv) {
925 } 925 }
926 926
927 zwlr_input_inhibit_manager_v1_get_inhibitor(state.input_inhibit_manager); 927 zwlr_input_inhibit_manager_v1_get_inhibitor(state.input_inhibit_manager);
928 if (wl_display_roundtrip(state.display) == -1) {
929 wlr_log(WLR_ERROR, "Exiting - failed to inhibit input:"
930 " is another lockscreen already running?");
931 return 2;
932 }
928 933
929 if (state.zxdg_output_manager) { 934 if (state.zxdg_output_manager) {
930 struct swaylock_surface *surface; 935 struct swaylock_surface *surface;