diff options
| author | Määttä Antti <antti.maatta@qt.io> | 2018-02-05 16:36:44 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-02-08 07:24:45 +0000 |
| commit | 156afc0f9dad1c16ee9a0ed31307121941443491 (patch) | |
| tree | d2a989470d7a7b3a4dc201e5410dbe4971614c27 /src/render/backend/renderer_p.h | |
| parent | b923dae74e9baf75aae99f87b19568ec1dc39f82 (diff) | |
Fix crash if sharecontext is requested before initailization
Scene2D can sometimes receive the render initialization event before the
qt3d renderer has been initialized. This causes crash because the
sharecontext hasn't been set yet. Add safeguard against this.
Task-number: QT3DS-904
Change-Id: Ib50a60ed89c12ac54c9165266466d9804affe77c
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
(cherry picked from commit 13f340c92bdf725d214ab4840fc2e071d12d6e00)
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/render/backend/renderer_p.h')
| -rw-r--r-- | src/render/backend/renderer_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h index 987576059..cbc686ab1 100644 --- a/src/render/backend/renderer_p.h +++ b/src/render/backend/renderer_p.h @@ -319,6 +319,7 @@ private: QAtomicInt m_lastFrameCorrect; QOpenGLContext *m_glContext; QOpenGLContext *m_shareContext; + mutable QMutex m_shareContextMutex; PickBoundingVolumeJobPtr m_pickBoundingVolumeJob; qint64 m_time; |