From 08bc7cc7bd82889b19ffc31915a323591c9c6d6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jonas=20=C3=85dahl?= Date: Thu, 11 Oct 2018 13:16:26 +0000 Subject: [PATCH] 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. (cherry picked from commit 149e4d69345adab2bfea84a04f88511cbad62fe0) Bug: https://gitlab.gnome.org/GNOME/mutter/issues/342 Applied-upstream: 3.30.3, commit:7260ba5db3fcf9b086944aef9f3d89f159ece137 Gbp-Pq: Name monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch --- 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 baed752..d9236b9 100644 --- a/src/backends/meta-monitor-manager.c +++ b/src/backends/meta-monitor-manager.c @@ -561,9 +561,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, -- 2.30.2