Merge pull request #37719 from bruvzg/macos_ignore_psn

Ignore process serial number argument passed by macOS Gatekeeper.

Merge pull request #37719 from bruvzg/macos_ignore_psn
4c36feb1 · Rémi Verschelde · GitHub · c2f0d58c · e92a14ac · 4c36feb1
Unverified Commit 4c36feb1 authored Apr 10, 2020 by Rémi Verschelde Committed by GitHub Apr 10, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

main.cpp main/main.cpp +8 -0

No files found.
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -478,6 +478,14 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph

 	I = args.front();
 	while (I) {
+#ifdef OSX_ENABLED
+		// Ignore the process serial number argument passed by macOS Gatekeeper.
+		// Otherwise, Godot would try to open a non-existent project on the first start and abort.
+		if (I->get().begins_with("-psn_")) {
+			I = I->next();
+			continue;
+		}
+#endif

 		List<String>::Element *N = I->next();