--- hatari/src/gui-sdl/dlgMain.c	2019/04/01 07:11:58	1.1.1.2
+++ hatari/src/gui-sdl/dlgMain.c	2019/04/01 07:12:23	1.1.1.3
@@ -6,7 +6,7 @@
 
   The main dialog.
 */
-char DlgMain_rcsid[] = "Hatari $Id: dlgMain.c,v 1.1.1.2 2019/04/01 07:11:58 root Exp $";
+char DlgMain_rcsid[] = "Hatari $Id: dlgMain.c,v 1.1.1.3 2019/04/01 07:12:23 root Exp $";
 
 #include "main.h"
 #include "configuration.h"
@@ -70,7 +70,7 @@ int Dialog_MainDlg(BOOL *bReset)
   BOOL bOldMouseVisibility;
   int nOldMouseX, nOldMouseY;
 
-  if(SDLGui_PrepareFont())
+  if(SDLGui_SetScreen(sdlscrn))
     return FALSE;
 
   SDL_GetMouseState(&nOldMouseX, &nOldMouseY);
@@ -84,7 +84,7 @@ int Dialog_MainDlg(BOOL *bReset)
 
   do
   {
-    retbut = SDLGui_DoDialog(maindlg);
+    retbut = SDLGui_DoDialog(maindlg, NULL);
     switch(retbut)
     {
       case MAINDLG_ABOUT:
@@ -123,7 +123,7 @@ int Dialog_MainDlg(BOOL *bReset)
           /* Configuration_Load uses the variables from ConfigureParams.
            * That's why we have to temporarily back it up here */
           tmpParams = ConfigureParams;
-          Configuration_Load();
+          Configuration_Load(NULL);
           DialogParams = ConfigureParams;
           ConfigureParams = tmpParams;
         }
@@ -144,7 +144,7 @@ int Dialog_MainDlg(BOOL *bReset)
         break;
     }
   }
-  while(retbut!=MAINDLG_OK && retbut!=MAINDLG_CANCEL && !bQuitProgram);
+  while (retbut!=MAINDLG_OK && retbut!=MAINDLG_CANCEL && retbut!=SDLGUI_QUIT && !bQuitProgram);
 
 
   if( maindlg[MAINDLG_RESET].state & SG_SELECTED )