diff --git a/src/config.c b/src/config.c index b84ef2aa6..f0b797dab 100644 --- a/src/config.c +++ b/src/config.c @@ -1,4 +1,4 @@ -/* +/* * 86Box A hypervisor and IBM PC system emulator that specializes in * running old operating systems and software designed for IBM * PC systems and compatibles from 1981 through fairly recent @@ -8,7 +8,7 @@ * * Configuration file handler. * - * Version: @(#)config.c 1.0.50 2018/09/02 + * Version: @(#)config.c 1.0.51 2018/09/03 * * Authors: Sarah Walker, * Miran Grca, @@ -1334,6 +1334,9 @@ config_load(void) } mem_size = 640; opl_type = 0; + isartc_type = 0; + for (i = 0; i < ISAMEM_MAX; i++) + isamem_type[i] = 0; config_log("Config file not present or invalid!\n"); return; diff --git a/src/win/win_settings.c b/src/win/win_settings.c index a8b7adc9c..fac579bb4 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -8,7 +8,7 @@ * * Windows 86Box Settings dialog handler. * - * Version: @(#)win_settings.c 1.0.54 2018/09/03 + * Version: @(#)win_settings.c 1.0.55 2018/09/03 * * Authors: Miran Grca, * David Hrdlička, @@ -1782,7 +1782,15 @@ win_settings_peripherals_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lPa strcpy(temp_hdc_name, "none"); h = GetDlgItem(hdlg, IDC_COMBO_SCSI); - temp_scsi_card = settings_list_to_device[SendMessage(h, CB_GETCURSEL, 0, 0)]; + temp_scsi_card = settings_list_to_device[0][SendMessage(h, CB_GETCURSEL, 0, 0)]; + + h = GetDlgItem(hdlg, IDC_COMBO_ISARTC); + temp_isartc = settings_list_to_device[1][SendMessage(h, CB_GETCURSEL, 0, 0)]; + + for (e = 0; e < ISAMEM_MAX; e++) { + h = GetDlgItem(hdlg, IDC_COMBO_ISAMEM_1 + e); + temp_isamem[e] = settings_list_to_device[2 + e][SendMessage(h, CB_GETCURSEL, 0, 0)]; + } h = GetDlgItem(hdlg, IDC_CHECK_IDE_TER); temp_ide_ter = SendMessage(h, BM_GETCHECK, 0, 0);