diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2017-11-07 07:55:16 -0600 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2017-11-07 07:55:16 -0600 |
| commit | d1e5e3ff5ee19e44e722e153ffd260f4a1f04bb2 (patch) | |
| tree | 3b9bddec51096ff3d4d2a84643410525f9346ba5 | |
| parent | fe62ed345b8de5b3431fa2e9d7bbbc01a7fb5473 (diff) | |
| download | efl-d1e5e3ff5ee19e44e722e153ffd260f4a1f04bb2.tar.gz | |
Revert "ecore_wl2: Remove just the flush from the idle handler"
This reverts commit e67aa661a0077f4069b67eefcb016424a630ab55.
I accidentally flagged this as a fix when it should've been a ref,
the bug (T6250) this was related to was actually fixed by the
previous 1.21 commit (a revert, returning the code to its 1.20 state).
The bug didn't exist on stable branch.
The patch was actually an optimization that requires all of my
1.21 wayland work. Ironically, backporting it to stable will
introduce the bug in T6250 there.
@ref T6250
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_display.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c index 69188674fb..79a9e59fc5 100644 --- a/src/lib/ecore_wl2/ecore_wl2_display.c +++ b/src/lib/ecore_wl2/ecore_wl2_display.c @@ -553,6 +553,12 @@ _cb_connect_idle(void *data) code = errno; if (ret < 0) goto err; + ret = wl_display_flush(ewd->wl.display); + code = errno; + if ((ret < 0) && (code == EAGAIN)) + ecore_main_fd_handler_active_set(ewd->fd_hdl, + (ECORE_FD_READ | ECORE_FD_WRITE)); + return ECORE_CALLBACK_RENEW; err: |