From bed7f3fbf6ef94e11c9b8620f7926a1b6751024f Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Date: Thu, 30 Oct 2014 12:32:50 +0200
Subject: Fix another crash at app shutdown.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Context doesn't exist on all envs at shutdown.

Change-Id: I6c0398203f0ab3ceaa38f64936cdf375c43e9f55
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 src/datavisualization/data/labelitem.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/datavisualization/data/labelitem.cpp')

diff --git a/src/datavisualization/data/labelitem.cpp b/src/datavisualization/data/labelitem.cpp
index 98c92854..4e0e9b5c 100644
--- a/src/datavisualization/data/labelitem.cpp
+++ b/src/datavisualization/data/labelitem.cpp
@@ -54,10 +54,9 @@ GLuint LabelItem::textureId() const
 
 void LabelItem::clear()
 {
-    if (m_textureId) {
+    if (m_textureId && QOpenGLContext::currentContext())
         QOpenGLContext::currentContext()->functions()->glDeleteTextures(1, &m_textureId);
-        m_textureId = 0;
-    }
+    m_textureId = 0;
     m_size = QSize(0, 0);
 }
 
-- 
cgit v1.2.3