From d430a517683096a79289ff71f942e9021868de35 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 30 Oct 2014 10:07:10 +0200 Subject: Fix crash on application shutdown. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Label items should not try to delete their textures at destructor if they are already deleted. Change-Id: I8131301bec47a0a2617b4a923d7cce430d35e18b Reviewed-by: Tomi Korpipää --- src/datavisualization/data/labelitem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/data') diff --git a/src/datavisualization/data/labelitem.cpp b/src/datavisualization/data/labelitem.cpp index ec8ba3fd..98c92854 100644 --- a/src/datavisualization/data/labelitem.cpp +++ b/src/datavisualization/data/labelitem.cpp @@ -28,7 +28,7 @@ LabelItem::LabelItem() LabelItem::~LabelItem() { - QOpenGLContext::currentContext()->functions()->glDeleteTextures(1, &m_textureId); + clear(); } void LabelItem::setSize(const QSize &size) -- cgit v1.2.3 From bed7f3fbf6ef94e11c9b8620f7926a1b6751024f Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen 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ää --- src/datavisualization/data/labelitem.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/datavisualization/data') 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