devilhorns pushed a commit to branch master.

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

    Properly check for primary output during new configurations.
    
    Signed-off-by: Chris Michael <[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 253cbfe..e0b8698 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)

-- 

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk

Reply via email to