summaryrefslogtreecommitdiffstats
path: root/src/yuzu_cmd
diff options
context:
space:
mode:
authorTobias <thm.frey@gmail.com>2018-09-11 03:29:59 +0200
committerbunnei <bunneidev@gmail.com>2018-09-11 03:29:59 +0200
commit804115b2a46d25408b34e3e08e83d3f926fd9968 (patch)
treee34636fd7928333756ef2d1282a2e2ef9c908069 /src/yuzu_cmd
parentMerge pull request #1286 from bunnei/multi-clear (diff)
downloadyuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.tar
yuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.tar.gz
yuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.tar.bz2
yuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.tar.lz
yuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.tar.xz
yuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.tar.zst
yuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.zip
Diffstat (limited to 'src/yuzu_cmd')
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
index 2f7916256..1c4717123 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
@@ -16,6 +16,7 @@
#include "input_common/keyboard.h"
#include "input_common/main.h"
#include "input_common/motion_emu.h"
+#include "input_common/sdl/sdl.h"
#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) {
@@ -116,7 +117,7 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) {
SDL_SetMainReady();
// Initialize the window
- if (SDL_Init(SDL_INIT_VIDEO) < 0) {
+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) {
LOG_CRITICAL(Frontend, "Failed to initialize SDL2! Exiting...");
exit(1);
}
@@ -176,6 +177,7 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) {
}
EmuWindow_SDL2::~EmuWindow_SDL2() {
+ InputCommon::SDL::CloseSDLJoysticks();
SDL_GL_DeleteContext(gl_context);
SDL_Quit();
@@ -220,6 +222,9 @@ void EmuWindow_SDL2::PollEvents() {
case SDL_QUIT:
is_open = false;
break;
+ default:
+ InputCommon::SDL::HandleGameControllerEvent(event);
+ break;
}
}
}