[mutter] monitor-manager: Don't use switch-config when ensuring configuration



commit 149e4d69345adab2bfea84a04f88511cbad62fe0
Author: Jonas Ã…dahl <jadahl gmail com>
Date:   Thu Oct 11 15:16:26 2018 +0200

    monitor-manager: Don't use switch-config when ensuring configuration
    
    Switch-configs are only to be used in certain circumstances (see
    meta_monitor_manager_can_switch_config()) so when ensuring
    configuration and attempting to create a linear configuration, use the
    linear configuration constructor function directly without going via the
    switch config method, otherwise we might incorrectly fall back to the
    fallback configuration (only enable primary monitor).
    
    This is a regression introduced by 6267732bec97773.
    
    Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/342

 src/backends/meta-monitor-manager.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index cb51c2142..cc70271f1 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -560,9 +560,7 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager)
       g_clear_object (&config);
     }
 
-  config =
-    meta_monitor_config_manager_create_for_switch_config (manager->config_manager,
-                                                          META_MONITOR_SWITCH_CONFIG_ALL_LINEAR);
+  config = meta_monitor_config_manager_create_linear (manager->config_manager);
   if (config)
     {
       if (!meta_monitor_manager_apply_monitors_config (manager,


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