From ff2fa24dc25519475687041ba6af829e9ba41335 Mon Sep 17 00:00:00 2001
From: jcm <6864788+jcm93@users.noreply.github.com>
Date: Sat, 20 Jul 2024 18:35:09 -0500
Subject: [PATCH] mac-virtualcam: Update NotInstalled error text for macOS 15

---
 .../mac-virtualcam/src/obs-plugin/data/locale/en-US.ini    | 1 +
 plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm       | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/mac-virtualcam/src/obs-plugin/data/locale/en-US.ini b/plugins/mac-virtualcam/src/obs-plugin/data/locale/en-US.ini
index 75301ff8e..e76c56b0a 100644
--- a/plugins/mac-virtualcam/src/obs-plugin/data/locale/en-US.ini
+++ b/plugins/mac-virtualcam/src/obs-plugin/data/locale/en-US.ini
@@ -1,5 +1,6 @@
 Plugin_Name="macOS Virtual Webcam"
 Error.SystemExtension.NotInstalled="The virtual camera is not installed.\n\nPlease allow OBS to install system software in System Settings → Privacy & Security → Security.\n\nYou may need to restart OBS if this message still appears afterward."
+Error.SystemExtension.NotInstalled.MacOS15="The virtual camera is not installed.\n\nPlease allow OBS to install the camera system extension in System Settings → General → Login Items & Extensions → Camera Extensions.\n\nYou may need to restart OBS if this message still appears afterward."
 Error.SystemExtension.CameraUnavailable="Could not find virtual camera.\n\nPlease try again."
 Error.SystemExtension.CameraNotStarted="Unable to start virtual camera.\n\nPlease try again."
 Error.SystemExtension.InstallationError="An error has occured while installing the virtual camera:"
diff --git a/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm b/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
index 62d39b8d6..b9f373e6e 100644
--- a/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
+++ b/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
@@ -306,7 +306,12 @@ static bool virtualcam_output_start(void *data)
                                                delegate.lastErrorMessage]
                         .UTF8String);
             } else {
-                obs_output_set_last_error(vcam->output, obs_module_text("Error.SystemExtension.NotInstalled"));
+                if (@available(macOS 15.0, *)) {
+                    obs_output_set_last_error(vcam->output,
+                                              obs_module_text("Error.SystemExtension.NotInstalled.MacOS15"));
+                } else {
+                    obs_output_set_last_error(vcam->output, obs_module_text("Error.SystemExtension.NotInstalled"));
+                }
             }
 
             return false;