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

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

View File

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