From b10e2020a7707a96cad2f7f1125ac0b2433ce564 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 3 Aug 2016 08:16:20 -0700
Subject: [PATCH] Don't crash on plugin switch

---
 .../src/display-plugins/OpenGLDisplayPlugin.cpp            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 80d0fe638b..cb66213f41 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -376,8 +376,11 @@ void OpenGLDisplayPlugin::uncustomizeContext() {
     _compositeTexture.reset();
     withPresentThreadLock([&] {
         _currentFrame.reset();
-        std::queue<gpu::FramePointer> empty;
-        _newFrameQueue.swap(empty);
+        while (!_newFrameQueue.empty()) {
+            _currentFrame = _newFrameQueue.front();
+            _currentFrame->preRender();
+            _newFrameQueue.pop();
+        }
     });
 }