[EGIT] [core/enlightenment] master 01/01: Fix zone setup for wayland compositor on X

[Derek Foreman]

derekf pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=c22c140c2f69a5bb0d4bd4f65d9bc030eddc6809

commit c22c140c2f69a5bb0d4bd4f65d9bc030eddc6809
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Fri Jun 24 14:18:21 2016 -0500

    Fix zone setup for wayland compositor on X
    
    Both the X and WL code try to set up the output pointer for the
    zone.  Make the WL output take precedence, since it's actually
    used for events.
---
 src/bin/e_comp_x_randr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/e_comp_x_randr.c b/src/bin/e_comp_x_randr.c
index 0cea2a6..20ab4e5 100644
--- a/src/bin/e_comp_x_randr.c
+++ b/src/bin/e_comp_x_randr.c
@@ -838,7 +838,7 @@ e_comp_x_randr_create(void)
                }
           }
         zone = e_zone_for_id_get(s->id);
-        if (zone) zone->output = s;
+        if (zone && !zone->output) zone->output = s;
         r->screens = eina_list_append(r->screens, s);
      }
 

--