--- hatari/src/gui-sdl/dlgMain.c 2019/04/01 07:12:48 1.1.1.4 +++ hatari/src/gui-sdl/dlgMain.c 2019/04/01 07:13:17 1.1.1.5 @@ -6,7 +6,7 @@ The main dialog. */ -char DlgMain_rcsid[] = "Hatari $Id: dlgMain.c,v 1.1.1.4 2019/04/01 07:12:48 root Exp $"; +const char DlgMain_rcsid[] = "Hatari $Id: dlgMain.c,v 1.1.1.5 2019/04/01 07:13:17 root Exp $"; #include "main.h" #include "configuration.h" @@ -118,26 +118,10 @@ int Dialog_MainDlg(BOOL *bReset) Dialog_DeviceDlg(); break; case MAINDLG_LOADCFG: - { - CNF_PARAMS tmpParams; - /* Configuration_Load uses the variables from ConfigureParams. - * That's why we have to temporarily back it up here */ - tmpParams = ConfigureParams; - Configuration_Load(NULL); - DialogParams = ConfigureParams; - ConfigureParams = tmpParams; - } + Dialog_LoadParams(); break; case MAINDLG_SAVECFG: - { - CNF_PARAMS tmpParams; - /* Configuration_Save uses the variables from ConfigureParams. - * That's why we have to temporarily back it up here */ - tmpParams = ConfigureParams; - ConfigureParams = DialogParams; - Configuration_Save(); - ConfigureParams = tmpParams; - } + Dialog_SaveParams(); break; case MAINDLG_QUIT: bQuitProgram = TRUE;