aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2018-03-16 12:47:05 -0500
committerDerek Foreman <derekf@osg.samsung.com>2018-03-16 12:48:41 -0500
commit7784405ad91f5c6e89a72dd4bec938480a2da087 (patch)
treecf92f3f2935c1cdd712f8501916e5f158d455199
parenteolian: add APIs to get unit from object and state from unit (diff)
downloadefl-7784405ad91f5c6e89a72dd4bec938480a2da087.tar.gz
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.
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_window.c14
1 files changed, 14 insertions, 0 deletions
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);