From: Derek Foreman <derekf@osg.samsung.com>
Date: Fri, 16 Mar 2018 17:47:05 +0000 (-0500)
Subject: ecore_wl2: Silence a commit ERR on window hide
X-Git-Tag: upstream/1.21.0~1603
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16cf182d9adf6fdb39ccb0d8468079e494ac284b;p=platform%2Fupstream%2Fefl.git

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.
---

diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c
index a294d34..e53c46f 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -1181,6 +1181,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);
@@ -1188,6 +1201,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);