--- hatari/src/gui-sdl/dlgScreen.c	2019/04/01 07:15:38	1.1.1.7
+++ hatari/src/gui-sdl/dlgScreen.c	2019/04/09 08:47:26	1.1.1.8
@@ -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.
 */
-const char DlgScreen_rcsid[] = "Hatari $Id: dlgScreen.c,v 1.1.1.7 2019/04/01 07:15:38 root Exp $";
+const char DlgScreen_fileid[] = "Hatari dlgScreen.c : " __DATE__ " " __TIME__;
 
 #include "main.h"
 #include "configuration.h"
@@ -144,6 +144,7 @@ void Dialog_ScreenDlg(void)
 {
 	int but, skip = 0;
 	unsigned int i;
+	MONITORTYPE	mti;
 
 	SDLGui_CenterDlg(screendlg);
 
@@ -275,14 +276,14 @@ void Dialog_ScreenDlg(void)
 	ConfigureParams.Screen.bAllowOverscan = (screendlg[DLGSCRN_OVERSCAN].state & SG_SELECTED);
 
 	if (screendlg[DLGSCRN_STATUSBAR].state & SG_SELECTED)
-		ConfigureParams.Screen.bShowStatusbar = TRUE;
+		ConfigureParams.Screen.bShowStatusbar = true;
 	else
-		ConfigureParams.Screen.bShowStatusbar = FALSE;
+		ConfigureParams.Screen.bShowStatusbar = false;
 
 	if (screendlg[DLGSCRN_ZOOMLOWRES].state & SG_SELECTED)
-		ConfigureParams.Screen.bZoomLowRes = TRUE;
+		ConfigureParams.Screen.bZoomLowRes = true;
 	else
-		ConfigureParams.Screen.bZoomLowRes = FALSE;
+		ConfigureParams.Screen.bZoomLowRes = false;
 
 	ConfigureParams.Screen.bUseExtVdiResolutions = (screendlg[DLGSCRN_USEVDIRES].state & SG_SELECTED);
 	for (i = DLGSCRN_SKIP0; i <= DLGSCRN_SKIP4; i++)
@@ -293,11 +294,11 @@ void Dialog_ScreenDlg(void)
 			break;
 		}
 	}
-	for (i = DLGSCRN_MONO; i <= DLGSCRN_TV; i++)
+	for (mti = MONITOR_TYPE_MONO; mti <= MONITOR_TYPE_TV; mti++)
 	{
-		if (screendlg[i].state & SG_SELECTED)
+		if (screendlg[mti + DLGSCRN_MONO].state & SG_SELECTED)
 		{
-			ConfigureParams.Screen.nMonitorType = i - DLGSCRN_MONO;
+			ConfigureParams.Screen.nMonitorType = mti;
 			break;
 		}
 	}