3 files changed, 16 insertions, 8 deletions
diff --git a/src/GPU.cpp b/src/GPU.cpp
index 56db0e2..60f863e 100644
--- a/src/GPU.cpp
+++ b/src/GPU.cpp
@@ -339,10 +339,10 @@ void SetRenderSettings(int renderer, RenderSettings& settings)
     int fbsize;
     if (accel) fbsize = (256*3 + 1) * 192;
     else       fbsize = 256 * 192;
-    if (Framebuffer[0][0]) delete[] Framebuffer[0][0];
-    if (Framebuffer[1][0]) delete[] Framebuffer[1][0];
-    if (Framebuffer[0][1]) delete[] Framebuffer[0][1];
-    if (Framebuffer[1][1]) delete[] Framebuffer[1][1];
+    if (Framebuffer[0][0]) { delete[] Framebuffer[0][0]; Framebuffer[0][0] = nullptr; }
+    if (Framebuffer[1][0]) { delete[] Framebuffer[1][0]; Framebuffer[1][0] = nullptr; }
+    if (Framebuffer[0][1]) { delete[] Framebuffer[0][1]; Framebuffer[0][1] = nullptr; }
+    if (Framebuffer[1][1]) { delete[] Framebuffer[1][1]; Framebuffer[1][1] = nullptr; }
 
     Framebuffer[0][0] = new u32[fbsize];
     Framebuffer[1][0] = new u32[fbsize];
diff --git a/src/frontend/qt_sdl/VideoSettingsDialog.cpp b/src/frontend/qt_sdl/VideoSettingsDialog.cpp
index 9645a3d..efb5051 100644
--- a/src/frontend/qt_sdl/VideoSettingsDialog.cpp
+++ b/src/frontend/qt_sdl/VideoSettingsDialog.cpp
@@ -59,7 +59,7 @@ VideoSettingsDialog::VideoSettingsDialog(QWidget* parent) : QDialog(parent), ui(
     for (int i = 1; i <= 16; i++)
         ui->cbxGLResolution->addItem(QString("%1x native (%2x%3)").arg(i).arg(256*i).arg(192*i));
     ui->cbxGLResolution->setCurrentIndex(Config::GL_ScaleFactor-1);
-printf("GL scale = %d\n", Config::GL_ScaleFactor);
+
     if (Config::_3DRenderer == 0)
     {
         ui->cbGLDisplay->setEnabled(true);
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index b6282fe..de71da9 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -282,7 +282,7 @@ void EmuThread::initOpenGL()
         return;
     }
 
-    oglContext = new QOpenGLContext();//oglSurface);
+    oglContext = new QOpenGLContext();
     oglContext->setFormat(oglSurface->format());
     oglContext->setShareContext(windowctx);
     if (!oglContext->create())
@@ -797,9 +797,16 @@ ScreenPanelGL::ScreenPanelGL(QWidget* parent) : QOpenGLWidget(parent)
 
 ScreenPanelGL::~ScreenPanelGL()
 {
-    // CHECKME!!!!
-    // ALSO TODO: CLEANUP
+    makeCurrent();
+
+    glDeleteTextures(1, &screenTexture);
+
+    glDeleteVertexArrays(1, &screenVertexArray);
+    glDeleteBuffers(1, &screenVertexBuffer);
+
     delete screenShader;
+
+    doneCurrent();
 }
 
 void ScreenPanelGL::setupScreenLayout()
@@ -1793,6 +1800,7 @@ void MainWindow::onUpdateVideoSettings(bool glchange)
         delete panel;
         createScreenPanel();
         connect(emuThread, SIGNAL(windowUpdate()), panel, SLOT(update()));
+        if (hasOGL) emuThread->initOpenGL();
     }
 
     videoSettingsDirty = true;