From 6afb287abb25e9caf1a4aba7c7a7ce07b2264b5d Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 10 Aug 2015 20:58:35 +0200 Subject: m + remove abort if connector is not found, that can actually happen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/lib/gamma-linux-drm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/gamma-linux-drm.c b/src/lib/gamma-linux-drm.c index b785c9f..b0d3a01 100644 --- a/src/lib/gamma-linux-drm.c +++ b/src/lib/gamma-linux-drm.c @@ -498,7 +498,7 @@ static drmModeConnector* find_connector(libgamma_crtc_state_t* restrict this, in *error = 0; /* Find connector. */ for (i = 0; i < n; i++) - if ((card->encoders[i] != NULL) && (card->encoders[i]->crtc_id == crtc_id)) + if ((card->encoders[i] != NULL) && (card->connectors[i] != NULL) && (card->encoders[i]->crtc_id == crtc_id)) return card->connectors[i]; /* We did not find the connector. */ *error = LIBGAMMA_CONNECTOR_UNKNOWN; @@ -788,8 +788,6 @@ int libgamma_linux_drm_get_crtc_information(libgamma_crtc_information_t* restric /* Find connector. */ if ((connector = find_connector(crtc, &error)) == NULL) { - perror("connector not found"); - abort(); /* Store reported error in affected fields. */ e |= this->width_mm_error = this->height_mm_error = this->connector_type_error = this->subpixel_order_error -- cgit v1.2.3-70-g09d2