Merge remote-tracking branch 'origin/master' into obattler

src/machine/m_europc.c

@@ -625,7 +625,7 @@ europc_boot(UNUSED(const device_t *info))
         mouse_bus_set_irq(sys->mouse, 2);
         /* Configure the port for (Bus Mouse Compatible) Mouse. */
         b |= 0x01;
-    } else if (joystick_type)
+    } else if (joystick_type[0])
         b |= 0x02; /* enable port as joysticks */
     sys->nvr.regs[MRTC_CONF_C] = b;
 

src/machine/m_xt_olivetti.c

@@ -2397,7 +2397,7 @@ machine_xt_m240_init(const machine_t *model)
     if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_at_device); /* io.c logs clearly show it using port 3F7 */
 
-    if (joystick_type)
+    if (joystick_type[0])
         device_add(&gameport_200_device);
 
     nmi_init();