From 9eaee356134e8f806db976f6aa04f64b24051337 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Tue, 2 Aug 2011 13:03:54 +0200 Subject: [PATCH] compositor-drm: Ignore disconnected connectors width - Fixes segfault, if first enumerated connector is not connected. - Corrects x-offset where e.g. the 2. of 3 connectors is not connected. (where width of 1. output would have taken twice as offset for output at 3. connector) --- compositor/compositor-drm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/compositor/compositor-drm.c b/compositor/compositor-drm.c index b6560bd1..d0973236 100644 --- a/compositor/compositor-drm.c +++ b/compositor/compositor-drm.c @@ -516,13 +516,15 @@ create_outputs(struct drm_compositor *ec, int option_connector) if (connector->connection == DRM_MODE_CONNECTED && (option_connector == 0 || - connector->connector_id == option_connector)) + connector->connector_id == option_connector)) { if (create_output_for_connector(ec, resources, connector, x, y) < 0) return -1; - x += container_of(ec->base.output_list.prev, struct wlsc_output, - link)->current->width; + x += container_of(ec->base.output_list.prev, + struct wlsc_output, + link)->current->width; + } drmModeFreeConnector(connector); }