isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

monitor-manager: Don't cancel confirm dialog on verifying

Browse Source 
When another D-Bus call that just tries to verify a configuration is
made, don't cancel any active monitor configuration dialog, as doing so
would effectively confirm queried configuration.

https://bugzilla.gnome.org/show_bug.cgi?id=786023
This commit is contained in:
Jonas Ådahl 2017-08-11 14:59:44 +08:00
parent 92a53f08f4
commit 6584d06bb5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backends/meta-monitor-manager.c
View File

@ -1965,7 +1965,8 @@ meta_monitor_manager_handle_apply_monitors_config (MetaDBusDisplayConfig *skelet
return TRUE; return TRUE;
} }
if (manager->persistent_timeout_id) if (manager->persistent_timeout_id &&
method != META_MONITORS_CONFIG_METHOD_VERIFY)
cancel_persistent_confirmation (manager); cancel_persistent_confirmation (manager);
if (!meta_monitor_manager_apply_monitors_config (manager, if (!meta_monitor_manager_apply_monitors_config (manager,