[macOS] Attempt to terminate process normally before using forceTerminate.

bruvzg · bruvzg · commit 393741a7e212 · 2024-08-06T12:45:56.000+03:00
diff --git a/platform/macos/os_macos.mm b/platform/macos/os_macos.mm
@@ -680,8 +680,11 @@
 	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 {

Original file line number	Diff line number	Diff line change
`@@ -680,8 +680,11 @@`
`680`	`680`	`if (!app) {`
`681`	`681`	`return OS_Unix::kill(p_pid);`
`682`	`682`	`}`
`683`		`-`
`684`		`- return [app forceTerminate] ? OK : ERR_INVALID_PARAMETER;`
	`683`	`+ bool terminated = [app terminate];`
	`684`	`+ if (!terminated) {`
	`685`	`+ terminated = [app forceTerminate];`
	`686`	`+ }`
	`687`	`+ return terminated ? OK : ERR_INVALID_PARAMETER;`
`685`	`688`	`}`
`686`	`689`
`687`	`690`	`String OS_MacOS::get_unique_id() const {`