godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #95295 from bruvzg/macos_kill 

[macOS] Remove kill override.
This commit is contained in:
Rémi Verschelde 2024-08-09 10:23:45 +02:00
parent 03afb92efa 9949d5a089
commit 088065c6cc
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/web_builds.yml vendored
View File

@ -7,7 +7,7 @@ env:
# Used for the cache key. Add version suffix to force clean build.
GODOT_BASE_BRANCH: master
SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no use_closure_compiler=yes
EM_VERSION: 3.1.59
EM_VERSION: 3.1.64
EM_CACHE_FOLDER: "emsdk-cache"
concurrency:

1
platform/macos/os_macos.h
View File

@ -109,7 +109,6 @@ public:
virtual String get_executable_path() const override;
virtual Error create_process(const String &p_path, const List<String> &p_arguments, ProcessID *r_child_id = nullptr, bool p_open_console = false) override;
virtual Error create_instance(const List<String> &p_arguments, ProcessID *r_child_id = nullptr) override;
virtual Error kill(const ProcessID &p_pid) override;
virtual bool is_process_running(const ProcessID &p_pid) const override;
virtual String get_unique_id() const override;

12
platform/macos/os_macos.mm
View File

@ -675,18 +675,6 @@ bool OS_MacOS::is_process_running(const ProcessID &p_pid) const {
return ![app isTerminated];
}
Error OS_MacOS::kill(const ProcessID &p_pid) {
NSRunningApplication *app = [NSRunningApplication runningApplicationWithProcessIdentifier:(pid_t)p_pid];
if (!app) {
return OS_Unix::kill(p_pid);
}
bool terminated = [app terminate];
if (!terminated) {
terminated = [app forceTerminate];
}
return terminated ? OK : ERR_INVALID_PARAMETER;
}
String OS_MacOS::get_unique_id() const {
static String serial_number;