CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-23 11:18:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-09-04 23:27:08 +02:00
parent 575e7b36ab
commit 7c6de82096
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/menu_displaylist.c
View File

@ -28,6 +28,7 @@
#include "menu_content.h" #include "menu_content.h"
#include "menu_driver.h" #include "menu_driver.h"
#include "menu_navigation.h" #include "menu_navigation.h"
#include "menu_popup.h"
#include "menu_cbs.h" #include "menu_cbs.h"
#ifdef HAVE_LIBRETRODB #ifdef HAVE_LIBRETRODB
@ -4177,7 +4178,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
case DISPLAYLIST_HELP: case DISPLAYLIST_HELP:
menu_entries_append_enum(info->list, info->path, menu_entries_append_enum(info->list, info->path,
info->label, MSG_UNKNOWN, info->type, info->directory_ptr, 0); info->label, MSG_UNKNOWN, info->type, info->directory_ptr, 0);
menu->help_screen.push = false; menu_popup_unset_pending_push(menu);
break; break;
case DISPLAYLIST_SETTING_ENUM: case DISPLAYLIST_SETTING_ENUM:
{ {

2
menu/menu_driver.c
View File

@ -181,7 +181,7 @@ static bool menu_init(menu_handle_t *menu_data)
&& !string_is_empty(settings->path.bundle_assets_src) && !string_is_empty(settings->path.bundle_assets_src)
&& !string_is_empty(settings->path.bundle_assets_dst) && !string_is_empty(settings->path.bundle_assets_dst)
#ifdef IOS #ifdef IOS
&& menu_data->help_screen.push && menu_popup_is_push_pending(menu_data)
#else #else
&& (settings->bundle_assets_extract_version_current && (settings->bundle_assets_extract_version_current
!= settings->bundle_assets_extract_last_version) != settings->bundle_assets_extract_last_version)

14
menu/menu_popup.c
View File

@ -220,6 +220,18 @@ int menu_popup_iterate_help(menu_handle_t *menu,
return 0; return 0;
} }
bool menu_popup_is_push_pending(menu_handle_t *menu)
{
return menu->help_screen.push;
}
void menu_popup_unset_pending_push(menu_handle_t *menu)
{
if (!menu)
return;
menu->help_screen.push = false;
}
void menu_popup_push_pending(menu_handle_t *menu, void menu_popup_push_pending(menu_handle_t *menu,
bool push, enum menu_help_type type) bool push, enum menu_help_type type)
{ {
@ -233,7 +245,7 @@ void menu_popup_push(menu_handle_t *menu)
{ {
menu_displaylist_info_t info = {0}; menu_displaylist_info_t info = {0};
if (!menu->help_screen.push) if (!menu_popup_is_push_pending(menu))
return; return;
info.list = menu_entries_get_menu_stack_ptr(0); info.list = menu_entries_get_menu_stack_ptr(0);

4
menu/menu_popup.h
View File

@ -32,6 +32,10 @@ void menu_popup_push_pending(menu_handle_t *menu,
int menu_popup_iterate_help(menu_handle_t *menu, int menu_popup_iterate_help(menu_handle_t *menu,
char *s, size_t len, const char *label); char *s, size_t len, const char *label);
void menu_popup_unset_pending_push(menu_handle_t *menu);
bool menu_popup_is_push_pending(menu_handle_t *menu);
void menu_popup_push(menu_handle_t *menu); void menu_popup_push(menu_handle_t *menu);
RETRO_END_DECLS RETRO_END_DECLS