mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 05:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

core_info should be correctly initialized now from the commandline;

Browse Source 
and not just when launched from menu
This commit is contained in:
twinaphex 2016-12-22 00:50:47 +01:00
parent 711c4116e0
commit 6cad8e3b74
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
driver.c
View File

@ -38,6 +38,7 @@
#include "wifi/wifi_driver.h" #include "wifi/wifi_driver.h"
#include "configuration.h" #include "configuration.h"
#include "core.h" #include "core.h"
#include "core_info.h"
#include "driver.h" #include "driver.h"
#include "runloop.h" #include "runloop.h"
#include "verbosity.h" #include "verbosity.h"
@ -345,6 +346,8 @@ static void init_drivers(int flags)
if ((flags & DRIVER_LOCATION_MASK) && location_driver_ctl(RARCH_LOCATION_CTL_IS_ACTIVE, NULL)) if ((flags & DRIVER_LOCATION_MASK) && location_driver_ctl(RARCH_LOCATION_CTL_IS_ACTIVE, NULL))
init_location(); init_location();
core_info_init_current_core();
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (flags & DRIVER_MENU_MASK) if (flags & DRIVER_MENU_MASK)
{ {
@ -388,6 +391,9 @@ static void init_drivers(int flags)
**/ **/
static void uninit_drivers(int flags) static void uninit_drivers(int flags)
{ {
core_info_deinit_list();
core_info_free_current_core();
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (flags & DRIVER_MENU_MASK) if (flags & DRIVER_MENU_MASK)
menu_driver_ctl(RARCH_MENU_CTL_DEINIT, NULL); menu_driver_ctl(RARCH_MENU_CTL_DEINIT, NULL);

7
menu/menu_driver.c
View File

@ -38,8 +38,6 @@
#include "../config.def.h" #include "../config.def.h"
#include "../content.h" #include "../content.h"
#include "../configuration.h" #include "../configuration.h"
#include "../core.h"
#include "../core_info.h"
#include "../dynamic.h" #include "../dynamic.h"
#include "../driver.h" #include "../driver.h"
#include "../retroarch.h" #include "../retroarch.h"
@ -185,9 +183,6 @@ static bool menu_init(menu_handle_t *menu_data)
if (!menu_entries_ctl(MENU_ENTRIES_CTL_INIT, NULL)) if (!menu_entries_ctl(MENU_ENTRIES_CTL_INIT, NULL))
return false; return false;
if (!core_info_init_current_core())
return false;
if (!menu_driver_ctl(RARCH_MENU_CTL_SHADER_INIT, NULL)) if (!menu_driver_ctl(RARCH_MENU_CTL_SHADER_INIT, NULL))
return false; return false;
@ -580,8 +575,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
command_event(CMD_EVENT_HISTORY_DEINIT, NULL); command_event(CMD_EVENT_HISTORY_DEINIT, NULL);
core_info_deinit_list();
core_info_free_current_core();
menu_dialog_reset(); menu_dialog_reset();
free(menu_driver_data); free(menu_driver_data);