Fix some weirdness down here.

This commit is contained in:
Alcaro 2015-11-20 16:30:55 +01:00
parent a59ca22457
commit 4b96b5814f
2 changed files with 4 additions and 3 deletions

View File

@ -613,9 +613,9 @@ static bool rarch_game_specific_options(char **output)
core_name = system ? system->info.library_name : NULL;
game_name = global ? path_basename(global->name.base) : NULL;
if (!core_name || !game_name)
if (!core_name || !game_name)
return false;
if (core_name[0] == '\0' || game_name == '\0')
if (core_name[0] == '\0' || game_name[0] == '\0')
return false;
RARCH_LOG("Per-game Options: core name: %s\n", core_name);

View File

@ -572,7 +572,8 @@ void fill_pathname_resolve_relative(char *out_path,
void fill_pathname_join(char *out_path,
const char *dir, const char *path, size_t size)
{
retro_assert(strlcpy(out_path, dir, size) < size);
if (out_path!=dir)
retro_assert(strlcpy(out_path, dir, size) < size);
if (*out_path)
fill_pathname_slash(out_path, size);