Merge pull request #8014 from orbea/screenshot

Fix screenshot filename with no core or content.
This commit is contained in:
Twinaphex 2019-01-16 16:07:57 +01:00 committed by GitHub
commit 31b1a91c3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -237,11 +237,19 @@ static bool screenshot_dump(
{ {
if (settings->bools.auto_screenshot_filename) if (settings->bools.auto_screenshot_filename)
{ {
const char *screenshot_name = NULL;
if (path_is_empty(RARCH_PATH_CONTENT)) if (path_is_empty(RARCH_PATH_CONTENT))
fill_str_dated_filename(shotname, system_info.library_name, {
IMG_EXT, sizeof(shotname)); if (string_is_empty(system_info.library_name))
screenshot_name = "RetroArch";
else else
fill_str_dated_filename(shotname, path_basename(name_base), screenshot_name = system_info.library_name;
}
else
screenshot_name = path_basename(name_base);
fill_str_dated_filename(shotname, screenshot_name,
IMG_EXT, sizeof(shotname)); IMG_EXT, sizeof(shotname));
} }
else else