From 1182552783411f10d7ce6e10d908176a27f28dbe Mon Sep 17 00:00:00 2001 From: Lucas Schwiderski Date: Wed, 26 May 2021 23:17:43 +0200 Subject: [PATCH] bug(a.keygrabber): Stop timer when stopping keygrabber When stopping a keygrabber with a timeout manually or through the stop key, the timer would continue and call the stop callback again some time later. The error message in `gears.timer:stop` is removed, since there actually is no harm in just returning immediately. And the timer implementation itself calls `:stop` in certain places without checking for `.started`, which lead to a situation where the internal call to `stop` triggered the error message. Signed-off-by: Lucas Schwiderski --- lib/awful/keygrabber.lua | 8 ++++++++ lib/gears/timer.lua | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/awful/keygrabber.lua b/lib/awful/keygrabber.lua index 08ccf0327..8cb1f5d70 100644 --- a/lib/awful/keygrabber.lua +++ b/lib/awful/keygrabber.lua @@ -474,12 +474,20 @@ function keygrabber:start() end --- Stop the keygrabber. +-- +-- Also stops any `timeout`. +-- -- @method stop -- @emits stopped -- @emits property::current_instance function keygrabber:stop(_stop_key, _stop_mods) -- (at)function disables ldoc params keygrab.stop(self.grabber) + local timer = self._private.timer + if timer and timer.started then + timer:stop() + end + if self.stop_callback then self.stop_callback( self.current_instance, _stop_key, _stop_mods, self.sequence diff --git a/lib/gears/timer.lua b/lib/gears/timer.lua index ee1778d71..c2f2f99ec 100644 --- a/lib/gears/timer.lua +++ b/lib/gears/timer.lua @@ -99,11 +99,13 @@ function timer:start() end --- Stop the timer. +-- +-- Does nothing if the timer isn't running. +-- -- @method stop -- @emits stop function timer:stop() if self.data.source_id == nil then - gdebug.print_error(traceback("timer not started")) return end glib.source_remove(self.data.source_id)