|  | @@ -288,12 +288,20 @@ bool findHDDImages()
 | 
	
		
			
				|  |  |          strcat(fullname, name);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          // Check whether this SCSI ID has been configured yet
 | 
	
		
			
				|  |  | -        if (s2s_getConfigById(id))
 | 
	
		
			
				|  |  | +        const S2S_TargetCfg* cfg = s2s_getConfigById(id);
 | 
	
		
			
				|  |  | +        if (cfg)
 | 
	
		
			
				|  |  |          {
 | 
	
		
			
				|  |  |            log("-- Ignoring ", fullname, ", SCSI ID ", id, " is already in use!");
 | 
	
		
			
				|  |  |            continue;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +        // Apple computers reserve ID 7, so warn the user this configuration wont work
 | 
	
		
			
				|  |  | +        if(id == 7 && cfg->quirks == S2S_CFG_QUIRKS_APPLE )
 | 
	
		
			
				|  |  | +        {
 | 
	
		
			
				|  |  | +          bluelog("-- Ignoring ", fullname, ", SCSI ID ", id, " Quirks set to Apple so can not use SCSI ID 7!");
 | 
	
		
			
				|  |  | +          continue;
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          // Type mapping based on filename.
 | 
	
		
			
				|  |  |          // If type is FIXED, the type can still be overridden in .ini file.
 | 
	
		
			
				|  |  |          S2S_CFG_TYPE type = S2S_CFG_FIXED;
 |