Remove redundant OsdNameSet calls.

This commit is contained in:
sorgelig
2021-07-24 22:35:24 +08:00
parent 8c7e8b66e3
commit 3ed545b9f4
2 changed files with 3 additions and 21 deletions

View File

@@ -1330,7 +1330,6 @@ void HandleUI(void)
else {
if (is_menu())
{
OsdCoreNameSet("");
SelectFile("", 0, SCANO_CORES, MENU_CORE_FILE_SELECTED1, MENU_SYSTEM1);
}
else if (is_minimig())
@@ -1562,12 +1561,8 @@ void HandleUI(void)
entry = 0;
uint32_t selentry = 0;
menumask = 0;
p = user_io_get_core_name();
if (!p[0]) OsdCoreNameSet("8BIT");
else OsdCoreNameSet(p);
if(!page) OsdSetTitle(OsdCoreNameGet());
else OsdSetTitle(title);
OsdSetTitle(page ? title : user_io_get_core_name());
dip_submenu = -1;
dip2_submenu = -1;
@@ -1821,16 +1816,6 @@ void HandleUI(void)
entry++;
}
}
// check for 'V'ersion strings
if (p[0] == 'V')
{
// get version string
strcpy(s, OsdCoreNameGet());
strcat(s, " ");
substrcpy(s + strlen(s), p, 1);
OsdCoreNameSet(s);
}
}
} while (p);
@@ -5766,7 +5751,6 @@ void HandleUI(void)
case MENU_SYSTEM2:
if (menu)
{
OsdCoreNameSet("");
SelectFile("", 0, SCANO_CORES, MENU_CORE_FILE_SELECTED1, MENU_SYSTEM1);
break;
}

View File

@@ -419,9 +419,9 @@ static void parse_config()
do {
p = user_io_get_confstr(i);
printf("get cfgstring %d = %s\n", i, p);
if (!i && p && p[0])
if (!i)
{
OsdCoreNameSet(p);
OsdCoreNameSet((p && p[0]) ? p : "CORE");
}
if (i == 1 && p)
@@ -1095,8 +1095,6 @@ void user_io_init(const char *path, const char *xml)
name = user_io_create_config_name();
if(strlen(name) > 0)
{
OsdCoreNameSet(user_io_get_core_name());
uint32_t status[2] = { 0, 0 };
if (!is_st() && !is_minimig())
{