Merge pull request #7285 from Zlika/master

(Menu) Fix crash when changing core's options on Android
This commit is contained in:
Twinaphex 2018-09-23 22:32:42 +02:00 committed by GitHub
commit 8a5ef19de9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -565,10 +565,15 @@ static int menu_input_pointer_post_iterate(
void menu_input_post_iterate(int *ret, unsigned action)
{
menu_entry_t entry;
size_t selection;
menu_file_list_cbs_t *cbs;
settings_t *settings = config_get_ptr();
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
size_t selection = menu_navigation_get_selection();
menu_file_list_cbs_t *cbs = selection_buf ?
menu_input_t *menu_input = menu_input_get_ptr();
if (menu_input != NULL && menu_input->pointer.pressed[0])
menu_navigation_set_selection(menu_input->pointer.ptr);
selection = menu_navigation_get_selection();
cbs = selection_buf ?
(menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(selection_buf, selection) : NULL;
menu_entry_init(&entry);