hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #64507 from RandomShaper/remove_unused

Browse source 
Remove unused `force_quit` variable from many OS abstractions
This commit is contained in:
Rémi Verschelde 2022-08-27 18:42:20 +02:00 • committed by GitHub
commit 67e731d450
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/macos/os_macos.h
View file

@ -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

5
platform/macos/os_macos.mm
View file

@ -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));