mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-11 00:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1585 from lakkatv/whitescreen

Browse Source 
(Menu) Prevent calling context reset twice, fixes the white screen on RP...
This commit is contained in:
Twinaphex 2015-04-05 16:01:02 +02:00
commit 97f316c225
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
driver.c
View File

@ -339,6 +339,7 @@ bool driver_update_system_av_info(const struct retro_system_av_info *info)
void init_drivers(int flags) void init_drivers(int flags)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
if (flags & DRIVER_VIDEO) if (flags & DRIVER_VIDEO)
driver->video_data_own = false; driver->video_data_own = false;
@ -391,7 +392,7 @@ void init_drivers(int flags)
if (flags & DRIVER_MENU) if (flags & DRIVER_MENU)
{ {
init_menu(); init_menu();
menu_driver_context_reset(); menu_update_libretro_info(&global->menu.info);
} }
#endif #endif

4
menu/menu.c
View File

@ -71,7 +71,7 @@ static void draw_frame(void)
* *
* Update menu state which depends on config. * Update menu state which depends on config.
**/ **/
static void menu_update_libretro_info(struct retro_system_info *info) void menu_update_libretro_info(struct retro_system_info *info)
{ {
#ifndef HAVE_DYNAMIC #ifndef HAVE_DYNAMIC
retro_get_system_info(info); retro_get_system_info(info);
@ -167,8 +167,6 @@ bool menu_load_content(void)
return false; return false;
} }
menu_update_libretro_info(&global->menu.info);
menu_shader_manager_init(driver->menu); menu_shader_manager_init(driver->menu);
rarch_main_command(RARCH_CMD_HISTORY_INIT); rarch_main_command(RARCH_CMD_HISTORY_INIT);

2
menu/menu.h
View File

@ -199,6 +199,8 @@ void menu_apply_deferred_settings(void);
bool menu_display_update_pending(void); bool menu_display_update_pending(void);
void menu_update_libretro_info(struct retro_system_info *info);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif