diff options
author | Weiyi Wang <wwylele@gmail.com> | 2017-07-17 17:08:02 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-17 17:08:02 +0300 |
commit | 924215a41fc3b1cfe16ae622a14a4bc856b5972e (patch) | |
tree | c0407aad38f63520e402ce713bf7a73fa6397f11 /src/citra/emu_window/emu_window_sdl2.cpp | |
parent | 308292dfa1674e68bb14179bc5a82710e6e24616 (diff) | |
parent | 77df82f5d66683f4928c4ad37f1deb77b79bb7df (diff) |
Merge pull request #2818 from B3n30/network
Enable data transfer over ENet
Diffstat (limited to 'src/citra/emu_window/emu_window_sdl2.cpp')
-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(); } |