From 249ae8e5f0fa21843929e114be6a7dcc4df8dade Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Tue, 22 May 2018 12:33:36 -0400 Subject: [PATCH] ecore_wl2_window: Silence early commit ERR for mouse cursors Summary: Our wayland mouse cursor code can trigger commits with commit pending when mousing into a window across CSD, which results in quickly setting the default cursors then an animated resize cursor before the first commit has finished. Fixing this is non trivial, and the bug is just a harmless inefficiency of little impact, so just disable the ERR for that specific case instead. Reviewers: zmike Reviewed By: zmike Subscribers: cedric, zmike Tags: #efl Differential Revision: https://phab.enlightenment.org/D6184 --- src/lib/ecore_wl2/ecore_wl2_window.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index 8895adaed5..b7593e1604 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -1610,7 +1610,10 @@ ecore_wl2_window_commit(Ecore_Wl2_Window *window, Eina_Bool flush) if (window->callback) wl_callback_destroy(window->callback); window->callback = NULL; - ERR("Commit before previous commit processed"); + /* The elm mouse cursor bits do some harmless but weird stuff that + * can hit this, silence the warning for that case only. */ + if (window->type != ECORE_WL2_WINDOW_TYPE_NONE) + ERR("Commit before previous commit processed"); } if (!window->pending.configure) {