mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8008 from natinusala/master

Browse Source 
libnx swkbd overclock fix + ozone memory leak fix
This commit is contained in:
Twinaphex 2019-01-14 20:01:56 +01:00 committed by GitHub
commit 0805f4e821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
menu/drivers/ozone/ozone_sidebar.c
View File

@ -423,16 +423,7 @@ void ozone_init_horizontal_list(ozone_handle_t *ozone)
if (settings->bools.menu_content_show_playlists && !string_is_empty(info.path))
{
if (menu_displaylist_ctl(DISPLAYLIST_DATABASE_PLAYLISTS_HORIZONTAL, &info))
{
size_t i;
for (i = 0; i < ozone->horizontal_list->size; i++)
{
ozone_node_t *node = ozone_alloc_node();
file_list_set_userdata(ozone->horizontal_list, i, node);
}
menu_displaylist_process(&info);
}
}
menu_displaylist_info_free(&info);

8
menu/widgets/menu_input_dialog.c
View File

@ -23,6 +23,7 @@
#ifdef HAVE_LIBNX
#include <switch.h>
#include "../../switch_performance_profiles.h"
#include "menu_osk.h"
#endif
@ -92,6 +93,7 @@ unsigned menu_input_dialog_get_kb_idx(void)
#ifdef HAVE_LIBNX
#define LIBNX_SWKBD_LIMIT 500 /* enforced by HOS */
extern u32 __nx_applet_type;
extern void libnx_apply_overclock();
#endif
bool menu_input_dialog_get_display_kb(void)
@ -106,6 +108,8 @@ bool menu_input_dialog_get_display_kb(void)
SwkbdConfig kbd;
pcvSetClockRate(PcvModule_Cpu, SWITCH_CPU_SPEEDS_VALUES[SWITCH_DEFAULT_CPU_PROFILE]);
Result rc = swkbdCreate(&kbd, 0);
if (R_SUCCEEDED(rc))
@ -145,10 +149,14 @@ bool menu_input_dialog_get_display_kb(void)
if (menu_input_dialog_keyboard_display)
input_keyboard_event(true, '\n', '\n', 0, RETRO_DEVICE_KEYBOARD);
libnx_apply_overclock();
return false;
}
else
{
libnx_apply_overclock();
return menu_input_dialog_keyboard_display;
}
#endif
return menu_input_dialog_keyboard_display;
}