diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2018-03-28 10:07:46 -0500 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2018-04-20 13:00:28 -0500 |
| commit | 486bd23ca15a06ea094bd3bdd0f3cbf18c826f2a (patch) | |
| tree | b52294bb401421ef38d78fc1510dcef855952df6 | |
| parent | a297f17ac38ea25b63332c98a73518754e69c2b0 (diff) | |
| download | efl-486bd23ca15a06ea094bd3bdd0f3cbf18c826f2a.tar.gz | |
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.
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_window.c | 4 |
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) EINA_SAFETY_ON_NULL_RETURN(window); EINA_SAFETY_ON_NULL_RETURN(window->surface); EINA_SAFETY_ON_TRUE_RETURN(window->pending.configure); - - if (window->commit_pending) - ERR("Commit before previous commit processed"); + EINA_SAFETY_ON_TRUE_RETURN(window->commit_pending); window->callback = wl_surface_frame(window->surface); wl_callback_add_listener(window->callback, &_frame_listener, window); |