summaryrefslogtreecommitdiffstats
path: root/src/citra/emu_window/emu_window_sdl2.cpp
diff options
context:
space:
mode:
authorWeiyi Wang <wwylele@gmail.com>2017-07-17 16:08:02 +0200
committerGitHub <noreply@github.com>2017-07-17 16:08:02 +0200
commit924215a41fc3b1cfe16ae622a14a4bc856b5972e (patch)
treec0407aad38f63520e402ce713bf7a73fa6397f11 /src/citra/emu_window/emu_window_sdl2.cpp
parentMerge pull request #2829 from MerryMage/check_submodules_present (diff)
parentNetwork: Changed timeout for receiving packets to 100ms (diff)
downloadyuzu-924215a41fc3b1cfe16ae622a14a4bc856b5972e.tar
yuzu-924215a41fc3b1cfe16ae622a14a4bc856b5972e.tar.gz
yuzu-924215a41fc3b1cfe16ae622a14a4bc856b5972e.tar.bz2
yuzu-924215a41fc3b1cfe16ae622a14a4bc856b5972e.tar.lz
yuzu-924215a41fc3b1cfe16ae622a14a4bc856b5972e.tar.xz
yuzu-924215a41fc3b1cfe16ae622a14a4bc856b5972e.tar.zst
yuzu-924215a41fc3b1cfe16ae622a14a4bc856b5972e.zip
Diffstat (limited to 'src/citra/emu_window/emu_window_sdl2.cpp')
-rw-r--r--src/citra/emu_window/emu_window_sdl2.cpp4
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();
}