isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

idle-monitor: Postpone dispatching of idle timeout if not ready

Browse Source 
If we update the ready time while the source is already in the
to-dispatch list, changing the ready time doesn't have any effect, and
the source will still be dispatched. This could cause incorrect idle
watch firing causing the power management plugin in
gnome-settings-daemon to sometimes turn off monitors due to it believing
the user had been idle for some time, while in fact, they just logged
back in.

Fix this by not actually dispatching the idle timeout if the ready time
is in the future when actually dispatching.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/543
This commit is contained in:
Jonas Ådahl 2019-04-16 18:07:31 +02:00 committed by Georges Basile Stavracas Neto
parent 23a8ea2821
commit 1ca0fdc928
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backends/meta-idle-monitor.c
View File

@ -316,6 +316,13 @@ idle_monitor_dispatch_timeout (GSource *source,
gpointer user_data) gpointer user_data)
{ {
MetaIdleMonitorWatch *watch = (MetaIdleMonitorWatch *) user_data; MetaIdleMonitorWatch *watch = (MetaIdleMonitorWatch *) user_data;
int64_t now;
int64_t ready_time;
now = g_source_get_time (source);
ready_time = g_source_get_ready_time (source);
if (ready_time > now)
return G_SOURCE_CONTINUE;
_meta_idle_monitor_watch_fire (watch); _meta_idle_monitor_watch_fire (watch);
g_source_set_ready_time (watch->timeout_source, -1); g_source_set_ready_time (watch->timeout_source, -1);