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

Merge pull request #95191 from bruvzg/macos_term 

[macOS] Attempt to terminate process normally before using `forceTerminate`.
This commit is contained in:
Rémi Verschelde 2024-08-06 12:32:22 +02:00
parent 8ba212f188 393741a7e2
commit 4577b37036
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
platform/macos/os_macos.mm
View File

@ -680,8 +680,11 @@ Error OS_MacOS::kill(const ProcessID &p_pid) {
if (!app) {
return OS_Unix::kill(p_pid);
}
return [app forceTerminate] ? OK : ERR_INVALID_PARAMETER;
bool terminated = [app terminate];
if (!terminated) {
terminated = [app forceTerminate];
}
return terminated ? OK : ERR_INVALID_PARAMETER;
}
String OS_MacOS::get_unique_id() const {