--- uae/src/cia.c	2018/04/24 16:43:26	1.1.1.5
+++ uae/src/cia.c	2018/04/24 16:44:47	1.1.1.6
@@ -314,8 +314,8 @@ static uae_u8 ReadCIAA(unsigned int addr
 	    serstat=serial_readstatus();		/* and only once per frame */
 
 	tmp = (DISK_status() & 0x3C);
-	if ((JSEM_ISMOUSE (0, currprefs.fake_joystick) && !buttonstate[0])
-	    || (!JSEM_ISMOUSE (0, currprefs.fake_joystick) && !(joy0button & 1)))
+	if ((JSEM_ISMOUSE (0, &currprefs) && !buttonstate[0])
+	    || (!JSEM_ISMOUSE (0, &currprefs) && !(joy0button & 1)))
 	    tmp |= 0x40;
 	if (!(joy1button & 1))
 	    tmp |= 0x80;
@@ -448,9 +448,9 @@ static void WriteCIAA(uae_u16 addr,uae_u
 	    }
 	} else {
 #if defined(__unix) && !defined(__BEOS__) && !defined(__DOS__)
-	    prttmp = (FILE *)popen ((const char *)prtname, "w");
+	    prttmp = (FILE *)popen ((const char *)currprefs.prtname, "w");
 #else
-	    prttmp = (FILE *)fopen ((const char *)prtname, "wb");
+	    prttmp = (FILE *)fopen ((const char *)currprefs.prtname, "wb");
 #endif
 	    if (prttmp != NULL) {
 		prtopen = 1;