diff options
| author | Frederik Gladhorn <[email protected]> | 2014-07-02 14:52:52 +0200 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2014-07-02 14:52:52 +0200 |
| commit | 7238de11c5028e6f9aeaed74295049b1e172294c (patch) | |
| tree | 370099640c8018d85e8613366d1e2276ab3f5ef1 /src/quick/scenegraph/qsgthreadedrenderloop.cpp | |
| parent | d1af0a90e6663d49c3e78ac674b0a1ae040c2085 (diff) | |
| parent | 41e924eb6e1c690bc81d095fc5e8f57244aae964 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/scenegraph/qsgthreadedrenderloop.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp index 584098cc89..a74a51146e 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp +++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp @@ -1218,9 +1218,11 @@ QImage QSGThreadedRenderLoop::grab(QQuickWindow *window) QImage result; w->thread->mutex.lock(); + m_lockedForSync = true; qCDebug(QSG_LOG_RENDERLOOP) << "- posting grab event"; w->thread->postEvent(new WMGrabEvent(window, &result)); w->thread->waitCondition.wait(&w->thread->mutex); + m_lockedForSync = false; w->thread->mutex.unlock(); qCDebug(QSG_LOG_RENDERLOOP) << "- grab complete"; |