diff options
author | B3n30 <benediktthomas@gmail.com> | 2017-07-08 18:42:14 +0200 |
---|---|---|
committer | B3n30 <benediktthomas@gmail.com> | 2017-07-16 21:29:19 +0200 |
commit | ebff5ba5140f0b093facf95fd5a05e6c71384736 (patch) | |
tree | 9d41dd7c44fd382fe96e36dfadcc680b2c40fdf8 /src/citra/emu_window/emu_window_sdl2.cpp | |
parent | Network: Send JoinRequest and handle the answer in RoomMember (diff) | |
download | yuzu-ebff5ba5140f0b093facf95fd5a05e6c71384736.tar yuzu-ebff5ba5140f0b093facf95fd5a05e6c71384736.tar.gz yuzu-ebff5ba5140f0b093facf95fd5a05e6c71384736.tar.bz2 yuzu-ebff5ba5140f0b093facf95fd5a05e6c71384736.tar.lz yuzu-ebff5ba5140f0b093facf95fd5a05e6c71384736.tar.xz yuzu-ebff5ba5140f0b093facf95fd5a05e6c71384736.tar.zst yuzu-ebff5ba5140f0b093facf95fd5a05e6c71384736.zip |
Diffstat (limited to '')
-rw-r--r-- | src/citra/emu_window/emu_window_sdl2.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index 47aadd60c..b0f808399 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp @@ -16,6 +16,7 @@ #include "core/settings.h" #include "input_common/keyboard.h" #include "input_common/main.h" +#include "network/network.h" void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0)); @@ -58,6 +59,7 @@ void EmuWindow_SDL2::OnResize() { EmuWindow_SDL2::EmuWindow_SDL2() { InputCommon::Init(); + Network::Init(); motion_emu = std::make_unique<Motion::MotionEmu>(*this); @@ -116,6 +118,8 @@ EmuWindow_SDL2::~EmuWindow_SDL2() { SDL_GL_DeleteContext(gl_context); SDL_Quit(); motion_emu = nullptr; + + Network::Shutdown(); InputCommon::Shutdown(); } |