diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2018-10-11 13:16:26 +0000 |
|---|---|---|
| committer | Marco Trevisan <mail@3v1n0.net> | 2019-07-08 17:38:10 +0000 |
| commit | 4f36e82f68601ac2eb121d508809814e29df37fc (patch) | |
| tree | 0bb9cea31935ea209a5da920f60edd4dbc2e70ba | |
| parent | b7bc8e56b7f6d5919f8ac5ae31c288d98ad91573 (diff) | |
| download | mutter-4f36e82f68601ac2eb121d508809814e29df37fc.tar.gz | |
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
(cherry picked from commit 149e4d69345adab2bfea84a04f88511cbad62fe0)
| -rw-r--r-- | src/backends/meta-monitor-manager.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c index 96d794a25..fecbfda73 100644 --- a/src/backends/meta-monitor-manager.c +++ b/src/backends/meta-monitor-manager.c @@ -582,9 +582,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, |