summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-07-31 09:58:08 -0400
committerChris Michael <cp.michael@samsung.com>2015-07-31 09:58:08 -0400
commita4ab05aadd17d988a214956aab4487ca8201a4aa (patch)
treebc34ad9135f20e2fdb9ae35d1c4b02e4c19a1dc1
parenta0a038681cd15949fd02a2d42b024d46839387b1 (diff)
evas-wayland-shm: Use wl_display_dispatch_pending to wait for buffers
Summary: This fixes T2625 where launching filemanager would cause a deadlock. The issue here is that wl_display_dispatch actually uses poll() which will block and wait, while using wl_display_dispatch_pending does not case any blocking. Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_shm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c b/src/modules/evas/engines/wayland_shm/evas_shm.c
index bb9f270991..1d8f594e21 100644
--- a/src/modules/evas/engines/wayland_shm/evas_shm.c
+++ b/src/modules/evas/engines/wayland_shm/evas_shm.c
@@ -419,7 +419,7 @@ _evas_shm_surface_wait(Shm_Surface *surface)
419 if (surface->leaf[i].valid) return &surface->leaf[i]; 419 if (surface->leaf[i].valid) return &surface->leaf[i];
420 } 420 }
421 421
422 wl_display_dispatch(surface->disp); 422 wl_display_dispatch_pending(surface->disp);
423 } 423 }
424 return NULL; 424 return NULL;
425} 425}