--- hatari/src/gui-sdl/dlgJoystick.c	2019/04/01 07:11:38	1.1
+++ hatari/src/gui-sdl/dlgJoystick.c	2019/04/01 07:12:22	1.1.1.2
@@ -4,7 +4,7 @@
   This file is distributed under the GNU Public License, version 2 or at
   your option any later version. Read the file gpl.txt for details.
 */
-char DlgJoystick_rcsid[] = "Hatari $Id: dlgJoystick.c,v 1.1 2019/04/01 07:11:38 root Exp $";
+char DlgJoystick_rcsid[] = "Hatari $Id: dlgJoystick.c,v 1.1.1.2 2019/04/01 07:12:22 root Exp $";
 
 #include "main.h"
 #include "configuration.h"
@@ -71,9 +71,9 @@ void Dialog_JoyDlg(void)
 
   do
   {
-    but = SDLGui_DoDialog(joystickdlg);
+    but = SDLGui_DoDialog(joystickdlg, NULL);
   }
-  while( but!=DLGJOY_EXIT && !bQuitProgram );
+  while (but != DLGJOY_EXIT && but != SDLGUI_QUIT && !bQuitProgram );
 
   /* Read values from dialog */
   DialogParams.Joysticks.Joy[1].bCursorEmulation = (joystickdlg[DLGJOY_J1CURSOR].state & SG_SELECTED);