From 7784405ad91f5c6e89a72dd4bec938480a2da087 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Fri, 16 Mar 2018 12:47:05 -0500 Subject: [PATCH] ecore_wl2: Silence a commit ERR on window hide Cosmetic fix, should be functionally identical. Hide can be called asynchronously, so it's ok, and the ERR can be silenced. --- src/lib/ecore_wl2/ecore_wl2_window.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index 3f4bf96547..c907f08ad0 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -633,6 +633,19 @@ ecore_wl2_window_hide(Ecore_Wl2_Window *window) EINA_INLIST_FOREACH_SAFE(window->subsurfs, tmp, subsurf) _ecore_wl2_subsurf_unmap(subsurf); + if (window->commit_pending) + { + /* We've probably been hidden while an animator + * is ticking. Cancel the callback. + */ + window->commit_pending = EINA_FALSE; + if (window->callback) + { + wl_callback_destroy(window->callback); + window->callback = NULL; + } + } + if (window->surface) { wl_surface_attach(window->surface, NULL, 0, 0); @@ -640,6 +653,7 @@ ecore_wl2_window_hide(Ecore_Wl2_Window *window) window->commit_pending = EINA_FALSE; } + /* The commit added a callback, disconnect it */ if (window->callback) { wl_callback_destroy(window->callback);