summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-03-01 13:49:02 -0600
committerDerek Foreman <derekf@osg.samsung.com>2017-03-01 13:49:02 -0600
commit16a1f8f188021227a590fb4cef0489849e2ff257 (patch)
tree4f8cc0ce8b4bcc875c42224ee3570cb1bc095ba4 /src
parentcb39bd158e65d0a96e47be5a20f57776102a2439 (diff)
ecore_wl2: Fix a wayland session recovery breaker... again
We need to bind a shell on reconnect, but dfb2af697 made sure we only bind a single shell per wayland display for the life of the display object - which lives longer than the connection. That means when session recovery tries to reconnect it never bothers to bind a shell, so the client can never post buffers. ref https://phab.enlightenment.org/T5226 ref https://phab.enlightenment.org/T5005 @fix
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_display.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c
index 689e1e8d3f..f054e461ab 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -279,6 +279,8 @@ _recovery_timer_add(Ecore_Wl2_Display *ewd)
279 ecore_main_fd_handler_del(ewd->fd_hdl); 279 ecore_main_fd_handler_del(ewd->fd_hdl);
280 ewd->fd_hdl = NULL; 280 ewd->fd_hdl = NULL;
281 281
282 ewd->shell_done = EINA_FALSE;
283
282 if (ewd->wl.session_recovery) 284 if (ewd->wl.session_recovery)
283 zwp_e_session_recovery_destroy(ewd->wl.session_recovery); 285 zwp_e_session_recovery_destroy(ewd->wl.session_recovery);
284 if (ewd->wl.www) www_destroy(ewd->wl.www); 286 if (ewd->wl.www) www_destroy(ewd->wl.www);