Browse Source

Merge pull request #95191 from bruvzg/macos_term

[macOS] Attempt to terminate process normally before using `forceTerminate`.
Rémi Verschelde 1 year ago
parent
commit
4577b37036
1 changed files with 5 additions and 2 deletions
  1. 5 2
      platform/macos/os_macos.mm

+ 5 - 2
platform/macos/os_macos.mm

@@ -680,8 +680,11 @@ Error OS_MacOS::kill(const ProcessID &p_pid) {
 	if (!app) {
 	if (!app) {
 		return OS_Unix::kill(p_pid);
 		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 {
 String OS_MacOS::get_unique_id() const {