summaryrefslogtreecommitdiff
path: root/src/backends
diff options
context:
space:
mode:
authorRui Matos <tiagomatos@gmail.com>2015-10-27 15:07:05 +0100
committerRui Matos <tiagomatos@gmail.com>2015-10-30 17:47:00 +0100
commit57ae203aab2f1da391a96df5c669baba489b49cf (patch)
treecb5eb26fbbf72ad8fc8079079ef4d1433a8afef6 /src/backends
parentbff75b64be3da88385173520c4f517693f02971c (diff)
downloadmutter-57ae203aab2f1da391a96df5c669baba489b49cf.tar.gz
Revert "monitor-manager-xrandr: Ignore outputs without modes"
This reverts commit 86a913d37aae4c96cb2e4d765b58fb4f60ec9d54. It introduced a memory leak, so we'll go for a cleaner approach. https://bugzilla.gnome.org/show_bug.cgi?id=756796
Diffstat (limited to 'src/backends')
-rw-r--r--src/backends/x11/meta-monitor-manager-xrandr.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c
index a555243f7..0acb217a8 100644
--- a/src/backends/x11/meta-monitor-manager-xrandr.c
+++ b/src/backends/x11/meta-monitor-manager-xrandr.c
@@ -808,15 +808,6 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
{
GBytes *edid;
- /* Get this first so that if there are no valid modes we
- can immediately skip to the next output without having
- to unwind all the assignments below. */
- output_get_modes (manager, meta_output, output);
- if (meta_output->n_modes == 0)
- continue;
-
- meta_output->preferred_mode = meta_output->modes[0];
-
meta_output->winsys_id = resources->outputs[i];
meta_output->name = g_strdup (output->name);
@@ -833,6 +824,8 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
meta_output->connector_type = output_get_connector_type (manager_xrandr, meta_output);
output_get_tile_info (manager_xrandr, meta_output);
+ output_get_modes (manager, meta_output, output);
+ meta_output->preferred_mode = meta_output->modes[0];
meta_output->n_possible_crtcs = output->ncrtc;
meta_output->possible_crtcs = g_new0 (MetaCRTC *, meta_output->n_possible_crtcs);