Skip to content
Snippets Groups Projects
Commit 1b531ddc authored by Monster Iestyn's avatar Monster Iestyn
Browse files

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
parents 44ed8ceb 497314fd
No related branches found
No related tags found
No related merge requests found
......@@ -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)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment