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

Update libretro-common

Browse Source
This commit is contained in:
twinaphex 2019-06-14 13:13:49 +02:00
parent d422638c45
commit 33d4d8b7c9
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libretro-common/file/file_path.c
View File

@ -406,7 +406,7 @@ char *find_last_slash(const char *str)
#ifdef _WIN32 #ifdef _WIN32
const char *backslash = strrchr(str, '\\'); const char *backslash = strrchr(str, '\\');
if (backslash && ((slash && backslash > slash) || !slash)) if (!slash || (backslash > slash))
return (char*)backslash; return (char*)backslash;
#endif #endif
return (char*)slash; return (char*)slash;
@ -547,11 +547,18 @@ bool fill_pathname_parent_dir_name(char *out_dir,
char *temp = strdup(in_dir); char *temp = strdup(in_dir);
char *last = find_last_slash(temp); char *last = find_last_slash(temp);
*last = '\0'; if (last && last[1] == 0)
{
*last = '\0';
last = find_last_slash(temp);
}
if (last)
*last = '\0';
in_dir = find_last_slash(temp); in_dir = find_last_slash(temp);
success = in_dir && in_dir + 1; success = in_dir && in_dir[1];
if (success) if (success)
strlcpy(out_dir, in_dir + 1, size); strlcpy(out_dir, in_dir + 1, size);

2
retroarch.c
View File

@ -3416,7 +3416,7 @@ static enum runloop_state runloop_check_state(
{ {
input_bits_t current_input; input_bits_t current_input;
#ifdef HAVE_MENU #ifdef HAVE_MENU
static input_bits_t last_input = {{0}}; static input_bits_t last_input = {{0}};
#endif #endif
static bool old_quit_key = false; static bool old_quit_key = false;
static bool quit_key = false; static bool quit_key = false;