From 0952409de4abcdc88f73940cb5ea13674947e0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 24 Feb 2017 17:09:19 +0800 Subject: [PATCH] monitor-manager: Always set current config when apply succeeds No reason making any caller do it. https://bugzilla.gnome.org/show_bug.cgi?id=777732 --- src/backends/meta-monitor-manager.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c index 4513bc0af..0af01f1d7 100644 --- a/src/backends/meta-monitor-manager.c +++ b/src/backends/meta-monitor-manager.c @@ -334,7 +334,12 @@ meta_monitor_manager_apply_monitors_config (MetaMonitorManager *manager, MetaMonitorManagerClass *manager_class = META_MONITOR_MANAGER_GET_CLASS (manager); - return manager_class->apply_monitors_config (manager, config, method, error); + if (!manager_class->apply_monitors_config (manager, config, method, error)) + return FALSE; + + meta_monitor_config_manager_set_current (manager->config_manager, config); + + return TRUE; } gboolean @@ -469,8 +474,6 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager) } done: - meta_monitor_config_manager_set_current (manager->config_manager, config); - if (!config) { meta_monitor_manager_apply_monitors_config (manager,