diff options
author | 2018-11-05 18:22:29 +0100 | |
---|---|---|
committer | 2018-11-05 18:22:29 +0100 | |
commit | 77d581f1441357d254acc70ad826a8fa67dd4dd0 (patch) | |
tree | bb71746de04a3d2e67218cc41812e885f82b929f /swayidle/main.c | |
parent | Merge pull request #3073 from oranenj/swayidle_workaround (diff) | |
parent | Revert "Work around swayidle never triggering on SIGUSR1" (diff) | |
download | sway-77d581f1441357d254acc70ad826a8fa67dd4dd0.tar.gz sway-77d581f1441357d254acc70ad826a8fa67dd4dd0.tar.zst sway-77d581f1441357d254acc70ad826a8fa67dd4dd0.zip |
Merge pull request #3075 from swaywm/revert-3073-swayidle_workaround
Revert "Work around swayidle never triggering on SIGUSR1"
Diffstat (limited to 'swayidle/main.c')
-rw-r--r-- | swayidle/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/swayidle/main.c b/swayidle/main.c index c7a17826..7d0f23f4 100644 --- a/swayidle/main.c +++ b/swayidle/main.c | |||
@@ -347,9 +347,7 @@ void sway_terminate(int exit_code) { | |||
347 | 347 | ||
348 | static void register_zero_idle_timeout(void *item) { | 348 | static void register_zero_idle_timeout(void *item) { |
349 | struct swayidle_timeout_cmd *cmd = item; | 349 | struct swayidle_timeout_cmd *cmd = item; |
350 | // A zero timeout never actually triggers. Adding a 50ms timeout is most | 350 | register_timeout(cmd, 0); |
351 | // likely not the correct fix either, but will work | ||
352 | register_timeout(cmd, 50); | ||
353 | } | 351 | } |
354 | 352 | ||
355 | static int handle_signal(int sig, void *data) { | 353 | static int handle_signal(int sig, void *data) { |