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

backends: Update inhibited state for the monitor and respect that state

Browse Source 
The inhibited state of the monitor was after the initializiation never
updated. meta_idle_monitor_reset_idletime didn't respect the inhibited
state, so it set timeouts if it shouldn't have.

Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/573
This commit is contained in:
Tim Klocke 2019-10-09 10:24:54 +02:00 committed by Jonas Ådahl
parent 658c741420
commit 81ee8886ce
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,6 +207,8 @@ update_inhibited (MetaIdleMonitor *monitor,
if (inhibited == monitor->inhibited) if (inhibited == monitor->inhibited)
return; return;
monitor->inhibited = inhibited;
g_hash_table_foreach (monitor->watches, g_hash_table_foreach (monitor->watches,
update_inhibited_watch, update_inhibited_watch,
monitor); monitor);
@ -514,6 +516,12 @@ meta_idle_monitor_reset_idletime (MetaIdleMonitor *monitor)
{ {
meta_idle_monitor_watch_fire (watch); meta_idle_monitor_watch_fire (watch);
} }
else
{
if (monitor->inhibited)
{
g_source_set_ready_time (watch->timeout_source, -1);
}
else else
{ {
g_source_set_ready_time (watch->timeout_source, g_source_set_ready_time (watch->timeout_source,
@ -521,6 +529,7 @@ meta_idle_monitor_reset_idletime (MetaIdleMonitor *monitor)
watch->timeout_msec * 1000); watch->timeout_msec * 1000);
} }
} }
}
g_list_free (watch_ids); g_list_free (watch_ids);
} }