princeamd pushed a commit to branch enlightenment-0.17.

commit 3d26cd06e614dae3dea8a6296ff7fac0dc60627c
Author: Chris Michael <[email protected]>
Date:   Thu Jul 25 13:28:46 2013 +0100

    Backport: a12ae8b :: Properly check for primary output during new 
configurations.
    
    Signed-off-by: Chris Michael <[email protected]>
    Signed-off-by: Deon Thomas <[email protected]>
---
 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 bb7de06..d1edbe4 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)

-- 

------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent 
caught up. So what steps can you take to put your SQL databases under 
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk

Reply via email to