diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 9e46fa9d98..6f8c16e2fd 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -443,7 +443,7 @@ int main(int argc, char** argv) { switch (result) { case Core::System::ResultStatus::ShutdownRequested: - emu_window->Close(); + emu_window->RequestClose(); break; case Core::System::ResultStatus::Success: break; diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index 30206486b8..08b36bf619 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp @@ -104,7 +104,7 @@ bool EmuWindow_SDL2::IsOpen() const { return is_open; } -void EmuWindow_SDL2::Close() { +void EmuWindow_SDL2::RequestClose() { is_open = false; } @@ -260,7 +260,7 @@ void EmuWindow_SDL2::PollEvents() { OnResize(); break; case SDL_WINDOWEVENT_CLOSE: - is_open = false; + RequestClose(); break; } break; @@ -291,7 +291,7 @@ void EmuWindow_SDL2::PollEvents() { OnFingerUp(); break; case SDL_QUIT: - is_open = false; + RequestClose(); break; default: break; diff --git a/src/citra/emu_window/emu_window_sdl2.h b/src/citra/emu_window/emu_window_sdl2.h index 831837ea67..27a0f07875 100644 --- a/src/citra/emu_window/emu_window_sdl2.h +++ b/src/citra/emu_window/emu_window_sdl2.h @@ -47,7 +47,7 @@ public: bool IsOpen() const; /// Close the window. - void Close(); + void RequestClose(); /// Creates a new context that is shared with the current context std::unique_ptr CreateSharedContext() const override;