summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-12-13 16:34:10 -0600
committerDerek Foreman <derekf@osg.samsung.com>2017-12-13 16:34:10 -0600
commit51599fe86c19da5024cdecd0e47debfd60522517 (patch)
tree39fc89c505a61d675044ceae607c89f3118c2e5e
parent55b8cf82441992910a908debe264497198250243 (diff)
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.
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_window.c6
1 files 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)
1483 EINA_SAFETY_ON_NULL_RETURN(window->surface); 1483 EINA_SAFETY_ON_NULL_RETURN(window->surface);
1484 1484
1485 if (window->commit_pending) 1485 if (window->commit_pending)
1486 ERR("Commit before previous commit processed"); 1486 {
1487 1487 wl_callback_destroy(window->callback);
1488 ERR("Commit before previous commit processed");
1489 }
1488 if (!window->pending.configure) 1490 if (!window->pending.configure)
1489 { 1491 {
1490 window->commit_pending = EINA_TRUE; 1492 window->commit_pending = EINA_TRUE;