CubeWidget: Fixed crash caused by not being in the correct context.

johanokl · Mar 14, 2018 · f252b71 · f252b71
1 parent bd745cf
commit f252b71
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/gui/cubewidget.cpp b/gui/cubewidget.cpp
@@ -31,7 +31,9 @@ CubeWidget::~CubeWidget()
 {
    // Make sure the context is current when deleting the texture
    makeCurrent();
-   delete texture;
+   if (texture) {
+      delete texture;
+   }
    arrayBuf.destroy();
    indexBuf.destroy();
    doneCurrent();
@@ -176,11 +178,16 @@ void CubeWidget::setTexture(const QPixmap &pixmap)
       makeCurrent();
       texture->release();
       delete texture;
+      texture = 0;
+      textureUpdated = true;
+   }
+   if (!pixmap.isNull() && !pixmap.size().isEmpty()) {
+      makeCurrent();
+      texture = new QOpenGLTexture(pixmap.toImage().mirrored());
+      texture->setMinificationFilter(QOpenGLTexture::Nearest);
+      texture->setMagnificationFilter(QOpenGLTexture::Linear);
+      textureUpdated = true;
    }
-   texture = new QOpenGLTexture(pixmap.toImage().mirrored());
-   texture->setMinificationFilter(QOpenGLTexture::Nearest);
-   texture->setMagnificationFilter(QOpenGLTexture::Linear);
-   textureUpdated = true;
 }
 
 /**