summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/window.cpp
diff options
context:
space:
mode:
author Brad Hughes <bradhugh@outlook.com>2016-03-05 09:52:54 -0500
committer Brad Hughes <bradhugh@outlook.com>2016-03-05 09:52:54 -0500
commit50fc05a49fcc6b689271ecff2dfae209bb4bfd47 (patch)
tree9bce43cfb23e17399376f45ee18a417b0dee5eef /src/osd/sdl/window.cpp
parentf7b8e47a17efd84963e685c39840ff111787d929 (diff)
parent23eaaa9244ffa216e0b8365916d9cf3af785279b (diff)
Merge branch 'master' of https://github.com/mamedev/mame.git
Diffstat (limited to 'src/osd/sdl/window.cpp')
-rw-r--r--src/osd/sdl/window.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 2a0147afea5..483ad426186 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -184,7 +184,7 @@ static OSDWORK_CALLBACK(sdlwindow_thread_id)
if (SDLMAME_INIT_IN_WORKER_THREAD)
{
- if (SDL_InitSubSystem(SDL_INIT_TIMER|SDL_INIT_AUDIO| SDL_INIT_VIDEO| SDL_INIT_JOYSTICK|SDL_INIT_NOPARACHUTE))
+ if (SDL_InitSubSystem(SDL_INIT_TIMER|SDL_INIT_AUDIO| SDL_INIT_VIDEO| SDL_INIT_GAMECONTROLLER|SDL_INIT_NOPARACHUTE))
{
osd_printf_error("Could not initialize SDL: %s.\n", SDL_GetError());
exit(-1);