From 102f896e92a3ed6a8648ba12a99b93f298e597d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= <jaakko.keranen@iki.fi>
Date: Tue, 6 Sep 2016 20:37:31 +0300
Subject: [PATCH] Fixed|GL: Added OpenGL context activations

An OpenGL context must be active when executing GL functions. This
includes destruction of OpenGL objects.
---
 doomsday/apps/client/src/busyrunner.cpp           | 2 ++
 doomsday/sdk/libappfw/src/widgets/panelwidget.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/doomsday/apps/client/src/busyrunner.cpp b/doomsday/apps/client/src/busyrunner.cpp
index 05a47ace16..bd952d5052 100644
--- a/doomsday/apps/client/src/busyrunner.cpp
+++ b/doomsday/apps/client/src/busyrunner.cpp
@@ -201,6 +201,8 @@ BusyRunner::Result BusyRunner::runTask(BusyTask *task)
     delete d->eventLoop;
     d->eventLoop = nullptr;
 
+    ClientWindow::main().glActivate(); // after processing other events
+
     // Teardown.
     if (d->busyWillAnimateTransition)
     {
diff --git a/doomsday/sdk/libappfw/src/widgets/panelwidget.cpp b/doomsday/sdk/libappfw/src/widgets/panelwidget.cpp
index 541f97cb26..282243edd2 100644
--- a/doomsday/sdk/libappfw/src/widgets/panelwidget.cpp
+++ b/doomsday/sdk/libappfw/src/widgets/panelwidget.cpp
@@ -362,6 +362,8 @@ void PanelWidget::dismiss()
 {
     if (isHidden()) return;
 
+    root().window().glActivate();
+
     hide();
     d->opened = false;
     d->dismissTimer.stop();