diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/datavisualization/engine/abstract3dcontroller.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index be4b0c76..12cd1b57 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,5 @@ load(qt_build_config) -MODULE_VERSION = 5.12.6 +MODULE_VERSION = 5.12.7 CONFIG += warning_clean CMAKE_MODULE_TESTS=- diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index 02a435aa..02b93ac5 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -112,11 +112,9 @@ void Abstract3DController::destroyRenderer() { QMutexLocker mutexLocker(&m_renderMutex); // Renderer can be in another thread, don't delete it directly in that case - if (m_renderer && m_renderer->thread() && m_renderer->thread() != this->thread()) + if (m_renderer) m_renderer->deleteLater(); - else - delete m_renderer; - m_renderer = 0; + m_renderer = nullptr; } /** |