From a54c377e6f80d392fda8beb9c54f784cbc2d674e Mon Sep 17 00:00:00 2001 From: CatalystG Date: Wed, 10 Apr 2013 21:25:38 -0400 Subject: [PATCH] (BlackBerry) Fix BB10 this time. Previous change didn't work on both. --- driver.c | 2 +- frontend/frontend_bbqnx.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/driver.c b/driver.c index ba033562e2..3b58ea8216 100644 --- a/driver.c +++ b/driver.c @@ -320,7 +320,7 @@ void global_uninit_drivers(void) { if (driver.video_data) { -#if defined(RARCH_CONSOLE) || defined(__BLACKBERRY_QNX__) +#ifdef RARCH_CONSOLE driver.video->stop(); #endif driver.video_data = NULL; diff --git a/frontend/frontend_bbqnx.c b/frontend/frontend_bbqnx.c index 2f5db11e7a..d5686bbb15 100644 --- a/frontend/frontend_bbqnx.c +++ b/frontend/frontend_bbqnx.c @@ -34,7 +34,8 @@ int rarch_main(int argc, char *argv[]) strlcpy(g_settings.libretro, "app/native/lib", sizeof(g_settings.libretro)); config_load(); - global_init_drivers(); + init_drivers_pre(); + init_drivers(); g_extern.verbose = true; @@ -55,7 +56,7 @@ int rarch_main(int argc, char *argv[]) if (g_extern.main_is_init) rarch_main_deinit(); else - global_uninit_drivers(); + uninit_drivers(); struct rarch_main_wrap args = {0};