summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-01-22 17:06:42 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-02-02 13:38:21 -0500
commit3fbdc847ab7f0ab7cb9612521c631f9b97981c71 (patch)
treef07ab9eddbd8590a9a40655433dc1e84187de028
parenta372e5ba1b248c36db4cc00c7ea12f6ab326da12 (diff)
do not attempt to create x11 canvas during xwayland init
this kills the gl_drm engine
-rw-r--r--src/bin/e_comp_x.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 18e95bd3c..d9de9d26a 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -5237,8 +5237,11 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h)
5237 5237
5238 e_alert_composite_win(root, e_comp->win); 5238 e_alert_composite_win(root, e_comp->win);
5239 5239
5240 if (!e_comp_x_randr_canvas_new(e_comp->win, w, h)) 5240 if (!e_comp->ee)
5241 ecore_job_add(_e_comp_x_add_fail_job, NULL); 5241 {
5242 if (!e_comp_x_randr_canvas_new(e_comp->win, w, h))
5243 ecore_job_add(_e_comp_x_add_fail_job, NULL);
5244 }
5242 5245
5243 ecore_x_composite_redirect_subwindows(root, ECORE_X_COMPOSITE_UPDATE_MANUAL); 5246 ecore_x_composite_redirect_subwindows(root, ECORE_X_COMPOSITE_UPDATE_MANUAL);
5244 5247