mirror of
https://github.com/libretro/RetroArch
synced 2025-03-03 04:14:00 +00:00
This reverts commit f46550bd7ce7347a4edef163390546a351f84d0d.
This commit is contained in:
parent
3b5f774d39
commit
e7fe79e8ed
@ -2313,11 +2313,6 @@ static int default_action_ok_load_content_with_core_from_menu(const char *_path,
|
||||
content_info.argv = NULL;
|
||||
content_info.args = NULL;
|
||||
content_info.environ_get = NULL;
|
||||
|
||||
/* Clear playlist cache to avoid stale data when
|
||||
* getting SYSTEM dir on launch via 'Load Content' */
|
||||
playlist_free_cached();
|
||||
|
||||
if (!task_push_load_content_with_core(
|
||||
_path, &content_info,
|
||||
(enum rarch_core_type)_type, NULL, NULL))
|
||||
|
35
runloop.c
35
runloop.c
@ -86,7 +86,6 @@
|
||||
#include <retro_miscellaneous.h>
|
||||
#include <queues/message_queue.h>
|
||||
#include <lists/dir_list.h>
|
||||
#include <retro_dirent.h>
|
||||
|
||||
#ifdef EMSCRIPTEN
|
||||
#include <emscripten/emscripten.h>
|
||||
@ -1985,43 +1984,13 @@ bool runloop_environment_cb(unsigned cmd, void *data)
|
||||
if ( system_info
|
||||
&& !string_is_empty(system_info->library_name))
|
||||
{
|
||||
bool entry_is_dir = false;
|
||||
|
||||
fill_pathname_join(dir_system_subdir,
|
||||
dir_system,
|
||||
system_info->library_name,
|
||||
sizeof(dir_system_subdir));
|
||||
|
||||
/* Inspect if the subdir has dirs under it, and ignore
|
||||
* it if so. Because for example PPSSPP already uses a
|
||||
* subdir named after 'library_name', so it would have
|
||||
* to be 'system/PPSSPP/PPSSPP' otherwise. */
|
||||
if (path_is_valid(dir_system_subdir))
|
||||
{
|
||||
struct RDIR *entry = retro_opendir(dir_system_subdir);
|
||||
if (entry)
|
||||
{
|
||||
while (retro_readdir(entry))
|
||||
{
|
||||
const char *entry_name = retro_dirent_get_name(entry);
|
||||
if (strstr(entry_name, "."))
|
||||
continue;
|
||||
|
||||
if (retro_dirent_is_dir(entry, NULL))
|
||||
{
|
||||
entry_is_dir = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
retro_closedir(entry);
|
||||
}
|
||||
}
|
||||
|
||||
if (entry_is_dir)
|
||||
dir_system_subdir[0] = '\0';
|
||||
else
|
||||
RARCH_DBG("[Environ]: SYSTEM_DIRECTORY candidate: \"%s\".\n",
|
||||
dir_system_subdir);
|
||||
RARCH_DBG("[Environ]: SYSTEM_DIRECTORY candidate: \"%s\".\n",
|
||||
dir_system_subdir);
|
||||
}
|
||||
|
||||
#ifdef HAVE_MENU
|
||||
|
Loading…
x
Reference in New Issue
Block a user