immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't open joystick if it's not enabled in ChangeJoystick

master
krzys-h 2015-07-10 10:28:04 +02:00
parent 20a367783b
commit d3c3a51ede
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/app.cpp
View File

@ -781,7 +781,10 @@ bool CApplication::ChangeJoystick(const JoystickDevice &newJoystick)
if (m_private->joystick != nullptr) if (m_private->joystick != nullptr)
CloseJoystick(); CloseJoystick();
return OpenJoystick(); if (m_joystickEnabled)
return OpenJoystick();
else
return true;
} }
Uint32 JoystickTimerCallback(Uint32 interval, void *) Uint32 JoystickTimerCallback(Uint32 interval, void *)