summaryrefslogtreecommitdiff
path: root/src/lib/ecore_wl2
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2018-03-28 10:07:46 -0500
committerDerek Foreman <derekf@osg.samsung.com>2018-04-20 13:00:28 -0500
commit486bd23ca15a06ea094bd3bdd0f3cbf18c826f2a (patch)
treeb52294bb401421ef38d78fc1510dcef855952df6 /src/lib/ecore_wl2
parenta297f17ac38ea25b63332c98a73518754e69c2b0 (diff)
ecore_wl2: Make ecore_wl2_window_false_commit more robust
False commit when a commit is already pending is an error, but for safety it should be a nop. Currently it would overwrite the existing frame callback which could cause problems on window destruction.
Diffstat (limited to 'src/lib/ecore_wl2')
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_window.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c
index 555d4f6539..6552d5ced3 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -1660,9 +1660,7 @@ ecore_wl2_window_false_commit(Ecore_Wl2_Window *window)
1660 EINA_SAFETY_ON_NULL_RETURN(window); 1660 EINA_SAFETY_ON_NULL_RETURN(window);
1661 EINA_SAFETY_ON_NULL_RETURN(window->surface); 1661 EINA_SAFETY_ON_NULL_RETURN(window->surface);
1662 EINA_SAFETY_ON_TRUE_RETURN(window->pending.configure); 1662 EINA_SAFETY_ON_TRUE_RETURN(window->pending.configure);
1663 1663 EINA_SAFETY_ON_TRUE_RETURN(window->commit_pending);
1664 if (window->commit_pending)
1665 ERR("Commit before previous commit processed");
1666 1664
1667 window->callback = wl_surface_frame(window->surface); 1665 window->callback = wl_surface_frame(window->surface);
1668 wl_callback_add_listener(window->callback, &_frame_listener, window); 1666 wl_callback_add_listener(window->callback, &_frame_listener, window);