Updater:Mac: Delay launch of new application until the old one exits

Prevents duplicate dock icons

common/CocoaTools.h

@@ -33,8 +33,8 @@ namespace CocoaTools
 	std::optional<std::string> GetNonTranslocatedBundlePath();
 	/// Move the given file to the trash, and return the path to its new location
 	std::optional<std::string> MoveToTrash(std::string_view file);
-	/// Launch the given application
-	bool LaunchApplication(std::string_view file);
+	/// Launch the given application once this one quits
+	bool DelayedLaunch(std::string_view file);
 }
 
 #endif // __APPLE__

common/CocoaTools.mm

@@ -175,27 +175,16 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 	return std::string([new_url fileSystemRepresentation]);
 }
 
-bool CocoaTools::LaunchApplication(std::string_view file)
+bool CocoaTools::DelayedLaunch(std::string_view file)
 {
-	NSURL* url = [NSURL fileURLWithPath:[[NSString alloc] initWithBytes:file.data() length:file.size() encoding:NSUTF8StringEncoding]];
-	if (@available(macOS 10.15, *))
-	{
-		// replacement api is async which isn't great for us
-		std::mutex done;
-		bool output;
-		done.lock();
-		NSWorkspaceOpenConfiguration* config = [NSWorkspaceOpenConfiguration new];
-		[config setCreatesNewApplicationInstance:YES];
-		[[NSWorkspace sharedWorkspace] openApplicationAtURL:url configuration:config completionHandler:[&](NSRunningApplication*_Nullable app, NSError*_Nullable error) {
-			output = app != nullptr;
-			done.unlock();
+	@autoreleasepool {
+		NSTask* task = [NSTask new];
+		[task setExecutableURL:[NSURL fileURLWithPath:@"/bin/sh"]];
+		[task setEnvironment:@{
+			@"WAITPID": [NSString stringWithFormat:@"%d", [[NSProcessInfo processInfo] processIdentifier]],
+			@"LAUNCHAPP": [[NSString alloc] initWithBytes:file.data() length:file.size() encoding:NSUTF8StringEncoding],
 		}];
-		done.lock();
-		done.unlock();
-		return output;
-	}
-	else
-	{
-		return [[NSWorkspace sharedWorkspace] launchApplicationAtURL:url options:NSWorkspaceLaunchNewInstance configuration:@{} error:nil];
+		[task setArguments:@[@"-c", @"while /bin/ps -p $WAITPID > /dev/null; do /bin/sleep 0.1; done; exec /usr/bin/open \"$LAUNCHAPP\";"]];
+		return [task launchAndReturnError:nil];
 	}
 }

pcsx2-qt/AutoUpdaterDialog.cpp

@@ -804,7 +804,8 @@ bool AutoUpdaterDialog::processUpdate(const QByteArray& update_data, QProgressDi
 		}
 		QDir(QString::fromStdString(*trashed_path)).removeRecursively();
 	}
-	if (!CocoaTools::LaunchApplication(open_path.toStdString()))
+	// For some reason if I use QProcess the shell gets killed immediately with SIGKILL, but NSTask is fine...
+	if (!CocoaTools::DelayedLaunch(open_path.toStdString()))
 	{
 		reportError("Failed to start new application");
 		return false;