Merge remote-tracking branch 'origin/stable' into 5.3

Change-Id: Iafccb173a9b5569bc9fd1022abb210955519fc61

1 files changed, 2 insertions, 0 deletions

diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index ae8d135d83..296050ec2f 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -1277,10 +1277,12 @@ QImage QSGThreadedRenderLoop::grab(QQuickWindow *window)
 
     QImage result;
     w->thread->mutex.lock();
+    m_locked = true;
     QSG_GUI_DEBUG(w->window, " - locking, posting grab event");
     w->thread->postEvent(new WMGrabEvent(window, &result));
     w->thread->waitCondition.wait(&w->thread->mutex);
     QSG_GUI_DEBUG(w->window, " - locking, grab done, unlocking");
+    m_locked = false;
     w->thread->mutex.unlock();
 
     QSG_GUI_DEBUG(w->window, " - grab complete");