ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: Retain default EEPROM path after generation

This commit is contained in:
Matt Borgerson 2020-11-07 14:45:55 -07:00 committed by mborgerson
parent aa256cbafa
commit 119bfda6b6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
softmmu/vl.c
View File

@ -3007,7 +3007,6 @@ void qemu_init(int argc, char **argv, char **envp)
fake_argv[fake_argc++] = g_strdup_printf("smbus-storage,file=%s", fake_argv[fake_argc++] = g_strdup_printf("smbus-storage,file=%s",
escaped_eeprom_path); escaped_eeprom_path);
free(escaped_eeprom_path); free(escaped_eeprom_path);
free((char*)eeprom_path);
} else { } else {
char *msg = g_strdup_printf("Failed to generate eeprom file '%s'. Please check machine settings.", eeprom_path); char *msg = g_strdup_printf("Failed to generate eeprom file '%s'. Please check machine settings.", eeprom_path);
xemu_queue_error_message(msg); xemu_queue_error_message(msg);

8
ui/xemu-settings.c
View File

@ -218,6 +218,11 @@ const char *xemu_settings_get_path(void)
const char *xemu_settings_get_default_eeprom_path(void) const char *xemu_settings_get_default_eeprom_path(void)
{ {
static char *eeprom_path = NULL;
if (eeprom_path != NULL) {
return eeprom_path;
}
char *base = SDL_GetPrefPath("xemu", "xemu"); char *base = SDL_GetPrefPath("xemu", "xemu");
assert(base != NULL); assert(base != NULL);
size_t base_len = strlen(base); size_t base_len = strlen(base);
@ -238,7 +243,8 @@ const char *xemu_settings_get_default_eeprom_path(void)
memcpy(path+base_len, name, name_len); memcpy(path+base_len, name, name_len);
path[final_len-1] = '\0'; path[final_len-1] = '\0';
return path; eeprom_path = path;
return eeprom_path;
} }
static int xemu_enum_str_to_int(const struct enum_str_map *map, const char *str, int *value) static int xemu_enum_str_to_int(const struct enum_str_map *map, const char *str, int *value)