--- np2/fdd/diskdrv.c	2004/01/27 07:51:49	1.4
+++ np2/fdd/diskdrv.c	2004/03/07 07:51:26	1.6
@@ -23,32 +23,36 @@ void diskdrv_sethdd(REG8 drv, const char
 	int		leng;
 
 	num = drv & 0x0f;
+	p = NULL;
+	leng = 0;
 	if (!(drv & 0x20)) {			// SASI or IDE
-		if (num >= 2) {
-			return;
+		if (num < 2) {
+			p = np2cfg.sasihdd[num];
+			leng = sizeof(np2cfg.sasihdd[0]);
 		}
-		p = np2cfg.sasihdd[num];
-		leng = sizeof(np2cfg.sasihdd[0]);
 	}
+#if defined(SUPPORT_SCSI)
 	else {							// SCSI
-		if (num >= 4) {
-			return;
+		if (num < 4) {
+			p = np2cfg.scsihdd[num];
+			leng = sizeof(np2cfg.scsihdd[0]);
 		}
-		p = np2cfg.scsihdd[num];
-		leng = sizeof(np2cfg.scsihdd[0]);
 	}
-	if (fname) {
-		file_cpyname(p, fname, leng);
-	}
-	else {
-		p[0] = '\0';
+#endif
+	if (p) {
+		if (fname) {
+			file_cpyname(p, fname, leng);
+		}
+		else {
+			p[0] = '\0';
+		}
+		sysmng_update(SYS_UPDATEHDD | SYS_UPDATECFG);
 	}
-	sysmng_update(SYS_UPDATEHDD | SYS_UPDATECFG);
 }
 
 void diskdrv_setfdd(REG8 drv, const char *fname, int readonly) {
 
-	if (drv < 4) {
+	if ((drv < 4) && (fdc.equip & (1 << drv))) {
 		fdd_eject(drv);
 		diskdrv_delay[drv] = 0;
 		diskdrv_fname[drv][0] = '\0';