From 401336c5e789f117411e94e9870a5b687e8bc0eb Mon Sep 17 00:00:00 2001 From: Ian Chamberlain Date: Mon, 22 Aug 2022 18:10:47 -0400 Subject: [PATCH] Rename Close() -> RequestClose() --- src/citra/citra.cpp | 2 +- src/citra/emu_window/emu_window_sdl2.cpp | 6 +++--- src/citra/emu_window/emu_window_sdl2.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 9e46fa9d9..6f8c16e2f 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 30206486b..08b36bf61 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 831837ea6..27a0f0787 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;