Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3363 from sclu1034/issue/keygrabber_timer 

Stop timer when stopping keygrabber
This commit is contained in:
mergify[bot] 2021-06-14 08:13:21 +00:00 committed by GitHub
parent b63399f656 1182552783
commit f4fb055512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/awful/keygrabber.lua
View File

@ -474,12 +474,20 @@ function keygrabber:start()
end end
--- Stop the keygrabber. --- Stop the keygrabber.
--
-- Also stops any `timeout`.
--
-- @method stop -- @method stop
-- @emits stopped -- @emits stopped
-- @emits property::current_instance -- @emits property::current_instance
function keygrabber:stop(_stop_key, _stop_mods) -- (at)function disables ldoc params function keygrabber:stop(_stop_key, _stop_mods) -- (at)function disables ldoc params
keygrab.stop(self.grabber) keygrab.stop(self.grabber)
local timer = self._private.timer
if timer and timer.started then
timer:stop()
end
if self.stop_callback then if self.stop_callback then
self.stop_callback( self.stop_callback(
self.current_instance, _stop_key, _stop_mods, self.sequence self.current_instance, _stop_key, _stop_mods, self.sequence

4
lib/gears/timer.lua
View File

@ -99,11 +99,13 @@ function timer:start()
end end
--- Stop the timer. --- Stop the timer.
--
-- Does nothing if the timer isn't running.
--
-- @method stop -- @method stop
-- @emits stop -- @emits stop
function timer:stop() function timer:stop()
if self.data.source_id == nil then if self.data.source_id == nil then
gdebug.print_error(traceback("timer not started"))
return return
end end
glib.source_remove(self.data.source_id) glib.source_remove(self.data.source_id)