[mutter] monitor-manager: Always set current config when apply succeeds



commit 0952409de4abcdc88f73940cb5ea13674947e0b8
Author: Jonas Ådahl <jadahl gmail com>
Date:   Fri Feb 24 17:09:19 2017 +0800

    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 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index 4513bc0..0af01f1 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,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]