claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't fatal if a CPU family is missing during conversion (for configs accidentally migrated from dev to non-dev builds)

Browse Source
This commit is contained in:
RichardG867
2020-11-18 13:49:10 -03:00
parent 2608c392bf
commit 55124ec59e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.c
View File

@@ -558,10 +558,8 @@ load_machine(void)
legacy_table_entry = (cpu_legacy_table_t *) &cpu_legacy_table[c].tables[legacy_mfg][i]; legacy_table_entry = (cpu_legacy_table_t *) &cpu_legacy_table[c].tables[legacy_mfg][i];
if (legacy_cpu >= legacy_table_entry->old_offset) { if (legacy_cpu >= legacy_table_entry->old_offset) {
/* Found CPU entry. */ /* Found CPU entry. */
if (!(legacy_family = cpu_get_family((char *) legacy_table_entry->family))) { if (!(legacy_family = cpu_get_family((char *) legacy_table_entry->family))) /* check if the family exists */
fatal("CPU family %s not found during legacy conversion\n", (char *) legacy_table_entry->family); break;
return;
}
config_set_string(cat, "cpu_family", (char *) legacy_family->internal_name); config_set_string(cat, "cpu_family", (char *) legacy_family->internal_name);
legacy_cpu -= legacy_table_entry->old_offset; legacy_cpu -= legacy_table_entry->old_offset;