Made helper window creation depend on initializing the Haptics or Joystick subsystems.

This commit is contained in:
Sam Lantinga 2013-11-08 14:05:15 -08:00
parent faebe94c56
commit 3523b409bc
1 changed files with 5 additions and 3 deletions

View File

@ -115,9 +115,11 @@ SDL_InitSubSystem(Uint32 flags)
SDL_ClearError(); SDL_ClearError();
#if SDL_VIDEO_DRIVER_WINDOWS #if SDL_VIDEO_DRIVER_WINDOWS
if (SDL_HelperWindowCreate() < 0) { if ((flags & (SDL_INIT_HAPTIC|SDL_INIT_JOYSTICK))) {
return -1; if (SDL_HelperWindowCreate() < 0) {
} return -1;
}
}
#endif #endif
#if !SDL_TIMERS_DISABLED #if !SDL_TIMERS_DISABLED