Merge pull request #183 from stuartisaac/main

Fix screenshot device chrome issue with Xcode 15
twostraws · Dec 20, 2023 · 79ec837 · 79ec837
2 parents f5b4223 + 2bd731e
commit 79ec837
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ControlRoom/Controllers/ChromeRendering/ChromeRenderer.swift b/ControlRoom/Controllers/ChromeRendering/ChromeRenderer.swift
@@ -98,7 +98,11 @@ class ChromeRenderer {
         let mainIdentifier = device.chromeIdentifier.components(separatedBy: ".").last ?? "phone"
 
         // Now use that last part to find the PDFs and placement JSON.
-        let chromePath = "\(basePath)/Chrome/\(mainIdentifier).simdevicechrome/Contents/Resources"
+        var chromePath = "\(basePath)/Chrome/\(mainIdentifier).devicechrome/Contents/Resources"
+        if !FileManager.default.fileExists(atPath: chromePath) {
+            // Before Xcode 15, the path used `simdevicechrome`, not `devicechrome`, so fall back to that
+            chromePath = "\(basePath)/Chrome/\(mainIdentifier).simdevicechrome/Contents/Resources"
+        }
         baseURL = URL(filePath: chromePath)
 
         let chromeURL = URL(filePath: "\(chromePath)/chrome.json")