diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-27 18:42:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-27 18:42:20 +0200 |
| commit | 67e731d45006853b44db458ebac0083da6b44776 (patch) | |
| tree | 8fcfba8c70c2fa4d34c9f0698a89e1b626f22780 /platform/macos | |
| parent | 85ef0a1058fb0acbf550b8d3674d02d9023de82b (diff) | |
| parent | 6e647dea2463e8c12dbf8c66ba237545c7a9ed0a (diff) | |
Merge pull request #64507 from RandomShaper/remove_unused
Remove unused `force_quit` variable from many OS abstractions
Diffstat (limited to 'platform/macos')
| -rw-r--r-- | platform/macos/os_macos.h | 2 | ||||
| -rw-r--r-- | platform/macos/os_macos.mm | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/platform/macos/os_macos.h b/platform/macos/os_macos.h index a1eb0f7f69..61db99689c 100644 --- a/platform/macos/os_macos.h +++ b/platform/macos/os_macos.h @@ -40,8 +40,6 @@ #include "servers/audio_server.h" class OS_MacOS : public OS_Unix { - bool force_quit = false; - JoypadMacOS *joypad_macos = nullptr; #ifdef COREAUDIO_ENABLED diff --git a/platform/macos/os_macos.mm b/platform/macos/os_macos.mm index cc550043de..47b53bba69 100644 --- a/platform/macos/os_macos.mm +++ b/platform/macos/os_macos.mm @@ -512,8 +512,6 @@ Error OS_MacOS::move_to_trash(const String &p_path) { } void OS_MacOS::run() { - force_quit = false; - if (!main_loop) { return; } @@ -521,7 +519,7 @@ void OS_MacOS::run() { main_loop->initialize(); bool quit = false; - while (!force_quit && !quit) { + while (!quit) { @try { if (DisplayServer::get_singleton()) { DisplayServer::get_singleton()->process_events(); // Get rid of pending events. @@ -541,7 +539,6 @@ void OS_MacOS::run() { OS_MacOS::OS_MacOS() { main_loop = nullptr; - force_quit = false; Vector<Logger *> loggers; loggers.push_back(memnew(MacOSTerminalLogger)); |