aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-11-05 18:22:29 +0100
committerLibravatar GitHub <noreply@github.com>2018-11-05 18:22:29 +0100
commit77d581f1441357d254acc70ad826a8fa67dd4dd0 (patch)
treebb71746de04a3d2e67218cc41812e885f82b929f
parentMerge pull request #3073 from oranenj/swayidle_workaround (diff)
parentRevert "Work around swayidle never triggering on SIGUSR1" (diff)
downloadsway-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"
-rw-r--r--swayidle/main.c4
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
348static void register_zero_idle_timeout(void *item) { 348static 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
355static int handle_signal(int sig, void *data) { 353static int handle_signal(int sig, void *data) {