devilhorns pushed a commit to branch master.

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

commit a4ab05aadd17d988a214956aab4487ca8201a4aa
Author: Chris Michael <[email protected]>
Date:   Fri Jul 31 09:58:08 2015 -0400

    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 <[email protected]>
---
 src/modules/evas/engines/wayland_shm/evas_shm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c 
b/src/modules/evas/engines/wayland_shm/evas_shm.c
index bb9f270..1d8f594 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)
              if (surface->leaf[i].valid) return &surface->leaf[i];
           }
 
-        wl_display_dispatch(surface->disp);
+        wl_display_dispatch_pending(surface->disp);
      }
    return NULL;
 }

-- 


Reply via email to