Merge branch 'tiny-joystick-fix' into 'master'

Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close.

See merge request STJr/SRB2!292
This commit is contained in:
Monster Iestyn 2018-10-09 15:19:41 -04:00
commit 1b531ddcfe

View file

@ -1154,6 +1154,7 @@ static void I_ShutdownJoystick2(void)
D_PostEvent(&event);
}
joystick2_started = 0;
JoyReset(&JoyInfo2);
if (!joystick_started && !joystick2_started && SDL_WasInit(SDL_INIT_JOYSTICK) == SDL_INIT_JOYSTICK)
{