From 51599fe86c19da5024cdecd0e47debfd60522517 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 13 Dec 2017 16:34:10 -0600 Subject: [PATCH] ecore_wl2: Better handling of extra commit Discard the old callback so it can't fire later - which can happen after the window's deleted in certain cases. --- src/lib/ecore_wl2/ecore_wl2_window.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index 37282400a8..231e48f6cb 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -1483,8 +1483,10 @@ ecore_wl2_window_commit(Ecore_Wl2_Window *window, Eina_Bool flush) EINA_SAFETY_ON_NULL_RETURN(window->surface); if (window->commit_pending) - ERR("Commit before previous commit processed"); - + { + wl_callback_destroy(window->callback); + ERR("Commit before previous commit processed"); + } if (!window->pending.configure) { window->commit_pending = EINA_TRUE;