eaw/Main_MiSTer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Assert status[0](RESET) before FC option parser.

Browse Source
This commit is contained in:
sorgelig
2021-06-04 22:52:43 +08:00
parent 214ab9304d
commit 882983e3b4
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
user_io.cpp
View File

@@ -1025,19 +1025,6 @@ void user_io_init(const char *path, const char *xml)
arcade_override_name(xml);
}
user_io_read_confstr();
user_io_read_core_name();
parse_config();
if (!xml && defmra[0] && FileExists(defmra))
{
// attn: FC option won't use name from defmra!
xml = (const char*)defmra;
strcpy(core_path, xml);
is_arcade_type = 1;
arcade_override_name(xml);
printf("Using default MRA: %s\n", xml);
}
if (core_type == CORE_TYPE_8BIT)
{
printf("Identified 8BIT core");
@@ -1051,6 +1038,19 @@ void user_io_init(const char *path, const char *xml)
user_io_set_core_name("sharpmz");
}
user_io_read_confstr();
user_io_read_core_name();
parse_config();
if (!xml && defmra[0] && FileExists(defmra))
{
// attn: FC option won't use name from defmra!
xml = (const char*)defmra;
strcpy(core_path, xml);
is_arcade_type = 1;
arcade_override_name(xml);
printf("Using default MRA: %s\n", xml);
}
cfg_parse();
if (cfg.bootcore[0] != '\0')
{