From 3d26cd06e614dae3dea8a6296ff7fac0dc60627c Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Thu, 25 Jul 2013 13:28:46 +0100 Subject: [PATCH] Backport: a12ae8b :: Properly check for primary output during new configurations. Signed-off-by: Chris Michael Signed-off-by: Deon Thomas --- src/bin/e_randr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/e_randr.c b/src/bin/e_randr.c index bb7de065e..d1edbe465 100644 --- a/src/bin/e_randr.c +++ b/src/bin/e_randr.c @@ -217,7 +217,6 @@ _e_randr_config_new(void) { Ecore_X_Window root = 0; Ecore_X_Randr_Crtc *crtcs = NULL; - Ecore_X_Randr_Output primary = 0; int ncrtcs = 0, i = 0; /* create new randr cfg */ @@ -282,10 +281,11 @@ _e_randr_config_new(void) /* assign crtc for this output */ output_cfg->crtc = crtcs[i]; output_cfg->exists = EINA_TRUE; - if ((int)outputs[j] == e_randr_cfg->primary) + if ((e_randr_cfg->primary) && + ((int)outputs[j] == e_randr_cfg->primary)) output_cfg->primary = EINA_TRUE; - if (!primary) + if (!e_randr_cfg->primary) { /* X has no primary output set */ if (j == 0)