From fdcc6e2087349a67c3e1d3b1fcf6234e248c772d Mon Sep 17 00:00:00 2001
From: CatalystG <CatalystGdev@gmail.com>
Date: Wed, 10 Apr 2013 20:27:49 -0400
Subject: [PATCH] (BlackBerry) Fix PlayBook crash after selecting a game from
 RGUI

---
 driver.c                  | 2 +-
 frontend/frontend_bbqnx.c | 2 ++
 gfx/context/bbqnx_ctx.c   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/driver.c b/driver.c
index 3b58ea8216..ba033562e2 100644
--- a/driver.c
+++ b/driver.c
@@ -320,7 +320,7 @@ void global_uninit_drivers(void)
 {
    if (driver.video_data)
    {
-#ifdef RARCH_CONSOLE
+#if defined(RARCH_CONSOLE) || defined(__BLACKBERRY_QNX__)
       driver.video->stop();
 #endif
       driver.video_data = NULL;
diff --git a/frontend/frontend_bbqnx.c b/frontend/frontend_bbqnx.c
index c2f0b9b999..2f5db11e7a 100644
--- a/frontend/frontend_bbqnx.c
+++ b/frontend/frontend_bbqnx.c
@@ -54,6 +54,8 @@ int rarch_main(int argc, char *argv[])
       {
 	     if (g_extern.main_is_init)
 	        rarch_main_deinit();
+	     else
+	        global_uninit_drivers();
 
 	     struct rarch_main_wrap args = {0};
 
diff --git a/gfx/context/bbqnx_ctx.c b/gfx/context/bbqnx_ctx.c
index 156855bf61..85b68b2da7 100644
--- a/gfx/context/bbqnx_ctx.c
+++ b/gfx/context/bbqnx_ctx.c
@@ -65,7 +65,7 @@ static void gfx_ctx_destroy(void)
    eglDestroyContext(g_egl_dpy, g_egl_ctx);
    eglDestroySurface(g_egl_dpy, g_egl_surf);
    eglTerminate(g_egl_dpy);
-   eglReleaseThread();
+   //eglReleaseThread();
 
    g_egl_dpy = EGL_NO_DISPLAY;
    g_egl_surf = EGL_NO_SURFACE;