--- hatari/src/gui-osx/PrefsController.m	2019/04/09 08:57:49	1.1.1.14
+++ hatari/src/gui-osx/PrefsController.m	2019/04/09 08:59:03	1.1.1.15
@@ -788,10 +788,11 @@ BOOL flag1, flag2;
 	IMPORT_SWITCH(FastBootPatch,ConfigureParams.System.bFastBoot);
 	IMPORT_RADIO(YMVoicesMixing,ConfigureParams.Sound.YmVolumeMixing);
 
-	//1.9.0 SDL2
+#if WITH_SDL2
 	IMPORT_SWITCH(SDL2UseLinearScaling, ConfigureParams.Screen.nRenderScaleQuality);
-	IMPORT_SWITCH(SDL2Resizable, ConfigureParams.Screen.bResizable) ;				// MS 06-2017
+	IMPORT_SWITCH(SDL2Resizable, ConfigureParams.Screen.bResizable);
 	IMPORT_SWITCH(SDL2UseVSync, ConfigureParams.Screen.bUseVsync);
+#endif
 
 	//deal with the Max Zoomed Stepper
 	IMPORT_NTEXTFIELD(maxZoomedWidth, ConfigureParams.Screen.nMaxWidth);
@@ -862,18 +863,18 @@ BOOL flag1, flag2;
 	
 	// If the IDE HD flag is set, load the IDE HD path, otherwise make it blank
 	//Master
-	if (ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage)
+	if (ConfigureParams.Ide[0].bUseDevice)
 	{
-		IMPORT_TEXTFIELD(ideMasterHdImage, masterIDE, ConfigureParams.HardDisk.szIdeMasterHardDiskImage);
+		IMPORT_TEXTFIELD(ideMasterHdImage, masterIDE, ConfigureParams.Ide[0].sDeviceFile);
 	}
 	else
 	{
 		ideMasterHdImage.stringValue = @"" ; [masterIDE setString:@""] ;
 	}
 	//Slave
-	if (ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage)
+	if (ConfigureParams.Ide[1].bUseDevice)
 	{
-		IMPORT_TEXTFIELD(ideSlaveHdImage, slaveIDE, ConfigureParams.HardDisk.szIdeSlaveHardDiskImage);
+		IMPORT_TEXTFIELD(ideSlaveHdImage, slaveIDE, ConfigureParams.Ide[1].sDeviceFile);
 	}
 	else
 	{
@@ -1058,10 +1059,12 @@ BOOL flag1, flag2;
 	//v1.6.1
 	EXPORT_SWITCH(FastBootPatch,ConfigureParams.System.bFastBoot);
 	EXPORT_RADIO(YMVoicesMixing,ConfigureParams.Sound.YmVolumeMixing);
-	//1.9.0 SDL2
+
+#if WITH_SDL2
 	EXPORT_SWITCH(SDL2UseLinearScaling, ConfigureParams.Screen.nRenderScaleQuality);
-	EXPORT_SWITCH(SDL2Resizable, ConfigureParams.Screen.bResizable) ;					// MS 06-2017
+	EXPORT_SWITCH(SDL2Resizable, ConfigureParams.Screen.bResizable);
 	EXPORT_SWITCH(SDL2UseVSync, ConfigureParams.Screen.bUseVsync);
+#endif
 
 	EXPORT_NTEXTFIELD(maxZoomedWidth, ConfigureParams.Screen.nMaxWidth);
 	EXPORT_NTEXTFIELD(maxZoomedHeight, ConfigureParams.Screen.nMaxHeight);
@@ -1128,23 +1131,23 @@ BOOL flag1, flag2;
 	// Define the IDE HD flag, and export the IDE HD path if one is selected
 	if (masterIDE.length > 0)
 	{
-		EXPORT_TEXTFIELD(masterIDE, ConfigureParams.HardDisk.szIdeMasterHardDiskImage);
-		ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage = YES;
+		EXPORT_TEXTFIELD(masterIDE, ConfigureParams.Ide[0].sDeviceFile);
+		ConfigureParams.Ide[0].bUseDevice = YES;
 	}
 	else
 	{
-		ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage = NO;
+		ConfigureParams.Ide[0].bUseDevice = NO;
 	}
 	
 	// IDE Slave
 	if (slaveIDE.length > 0)
 	{
-		EXPORT_TEXTFIELD(slaveIDE, ConfigureParams.HardDisk.szIdeSlaveHardDiskImage);
-		ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage = YES;
+		EXPORT_TEXTFIELD(slaveIDE, ConfigureParams.Ide[1].sDeviceFile);
+		ConfigureParams.Ide[1].bUseDevice = YES;
 	}
 	else
 	{
-		ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage = NO;
+		ConfigureParams.Ide[1].bUseDevice = NO;
 	}
 	
 	// Define the Gemdos flag, and export the Gemdos path if one is selected