--- hatari/src/gui-osx/PrefsController.m	2019/04/09 08:48:36	1.1.1.6
+++ hatari/src/gui-osx/PrefsController.m	2019/04/09 08:50:13	1.1.1.8
@@ -516,7 +516,7 @@ static const int nSoundFreqs[] =
 - (void)initKeysDropDown:(NSPopUpButton*)dropDown
 {
 	[dropDown removeAllItems];
-	int i;
+	unsigned int i;
 	for (i = 0; i < Preferences_cKeysForJoysticks; i++)
 	{
 		SDLKey key = Preferences_KeysForJoysticks[i];
@@ -611,7 +611,7 @@ static const int nSoundFreqs[] =
 	IMPORT_SWITCH(autoInsertB, ConfigureParams.DiskImage.bAutoInsertDiskB);
     IMPORT_SWITCH(blitter, ConfigureParams.System.bBlitter);
 	IMPORT_SWITCH(bootFromHD, ConfigureParams.HardDisk.bBootFromHardDisk);	
-    IMPORT_SWITCH(captureOnChange, ConfigureParams.Screen.bCaptureChange);
+    IMPORT_SWITCH(captureOnChange, ConfigureParams.Screen.bCrop);
     IMPORT_TEXTFIELD(cartridgeImage, ConfigureParams.Rom.szCartridgeImageFileName);
     IMPORT_RADIO(colorDepth, ConfigureParams.Screen.nVdiColors);
     IMPORT_SWITCH(compatibleCpu, ConfigureParams.System.bCompatibleCpu);
@@ -632,7 +632,7 @@ static const int nSoundFreqs[] =
     IMPORT_RADIO(ramSize, ConfigureParams.Memory.nMemorySize);
     IMPORT_TEXTFIELD(readRS232FromFile, ConfigureParams.RS232.szInFileName);
     IMPORT_SWITCH(realTime, ConfigureParams.System.bRealTimeClock);
-    IMPORT_SWITCH(slowFDC, ConfigureParams.DiskImage.bSlowFloppy);
+    IMPORT_SWITCH(fastFDC, ConfigureParams.DiskImage.FastFloppy);
     IMPORT_TEXTFIELD(tosImage, ConfigureParams.Rom.szTosImageFileName);
     IMPORT_SWITCH(useBorders, ConfigureParams.Screen.bAllowOverscan);
     IMPORT_SWITCH(useVDIResolution, ConfigureParams.Screen.bUseExtVdiResolutions);
@@ -822,7 +822,7 @@ static const int nSoundFreqs[] =
 	EXPORT_SWITCH(autoInsertB, ConfigureParams.DiskImage.bAutoInsertDiskB);
     EXPORT_SWITCH(blitter, ConfigureParams.System.bBlitter);
 	EXPORT_SWITCH(bootFromHD, ConfigureParams.HardDisk.bBootFromHardDisk);
-    EXPORT_SWITCH(captureOnChange, ConfigureParams.Screen.bCaptureChange);
+    EXPORT_SWITCH(captureOnChange, ConfigureParams.Screen.bCrop);
     EXPORT_TEXTFIELD(cartridgeImage, ConfigureParams.Rom.szCartridgeImageFileName);
     EXPORT_RADIO(colorDepth, ConfigureParams.Screen.nVdiColors);
     EXPORT_SWITCH(compatibleCpu, ConfigureParams.System.bCompatibleCpu);
@@ -843,7 +843,7 @@ static const int nSoundFreqs[] =
     EXPORT_RADIO(ramSize, ConfigureParams.Memory.nMemorySize);
     EXPORT_TEXTFIELD(readRS232FromFile, ConfigureParams.RS232.szInFileName);
     EXPORT_SWITCH(realTime, ConfigureParams.System.bRealTimeClock);
-    EXPORT_SWITCH(slowFDC, ConfigureParams.DiskImage.bSlowFloppy);
+    EXPORT_SWITCH(fastFDC, ConfigureParams.DiskImage.FastFloppy);
     EXPORT_TEXTFIELD(tosImage, ConfigureParams.Rom.szTosImageFileName);
     EXPORT_SWITCH(useBorders, ConfigureParams.Screen.bAllowOverscan);
     EXPORT_SWITCH(useVDIResolution, ConfigureParams.Screen.bUseExtVdiResolutions);