From 9bf1e7ddce29dd2d84d514b37c87fe7f9adc5b63 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 10 May 2012 14:00:08 +0300 Subject: Do not crash all the time with shm apps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iea42adf18cbd724f1f9dc19ec1d1f6baeff07d97 Reviewed-by: Samuel Rødal --- src/plugins/platforms/wayland/qwaylandwindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/wayland/qwaylandwindow.cpp') diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index c023de58e..5635322f0 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.cpp +++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp @@ -228,11 +228,12 @@ const wl_callback_listener QWaylandWindow::callbackListener = { QWaylandWindow::frameCallback }; -void QWaylandWindow::frameCallback(void *data, struct wl_callback *wl_callback, uint32_t time) +void QWaylandWindow::frameCallback(void *data, struct wl_callback *callback, uint32_t time) { Q_UNUSED(time); - Q_UNUSED(wl_callback); QWaylandWindow *self = static_cast(data); + if (callback != self->mFrameCallback) // might be a callback caused by the shm backingstore + return; self->mWaitingForFrameSync = false; if (self->mFrameCallback) { wl_callback_destroy(self->mFrameCallback); -- cgit v1.2.3