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

Merged all the latest and missed 86box commits.

Browse Source 
Finally fixed the configuration UI of the FDC's.
This commit is contained in:
TC1995
2020-06-17 14:29:24 +02:00
parent 90d1ddac52
commit b97b9ae2f9
12 changed files with 183 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/config.c
View File

@@ -785,21 +785,10 @@ load_other_peripherals(void)
scsi_card_current = 0;
p = config_get_string(cat, "fdc", NULL);
if (p == NULL) {
p = (char *)malloc((strlen("internal")+1)*sizeof(char));
strcpy(p, "internal");
free_p = 1;
}
if (!strcmp(p, "internal"))
if (p != NULL)
fdc_type = fdc_card_get_from_internal_name(p);
else
fdc_type = FDC_INTERNAL;
else
fdc_type = fdc_ext_get_from_internal_name(p);
if (free_p) {
free(p);
p = NULL;
}
p = config_get_string(cat, "hdc", NULL);
if (p == NULL) {
@@ -1762,8 +1751,11 @@ save_other_peripherals(void)
config_set_string(cat, "scsicard",
scsi_card_get_internal_name(scsi_card_current));
config_set_string(cat, "fdc",
fdc_ext_get_internal_name(fdc_type));
if (fdc_type == FDC_INTERNAL)
config_delete_var(cat, "fdc");
else
config_set_string(cat, "fdc",
fdc_card_get_internal_name(fdc_type));
config_set_string(cat, "hdc",
hdc_get_internal_name(hdc_current));