isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-02 14:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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


(cherry picked from commit 149e4d69345adab2bfea84a04f88511cbad62fe0)
This commit is contained in:
Jonas Ådahl 2018-10-11 13:16:26 +00:00 committed by Marco Trevisan
parent 1c57a58420
commit 7260ba5db3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backends/meta-monitor-manager.c
View File

@ -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,