fix pause menu set skin

Signed-off-by: Joseph Mattiello <git@joemattiello.com>

Author: JoeMatt

PVUI/Sources/PVUIBase/PVEmulatorVC/PauseTileMenuView.swift

@@ -1341,7 +1341,11 @@ struct PauseTileMenuView: View {
         }
         .sheet(isPresented: $showingSkinCatalog) {
             NavigationStack {
-                SkinCatalogBrowserView(preselectedSystem: activeSystemIdentifier.skinCatalogSystemCode)
+                SkinCatalogBrowserView(
+                    preselectedSystem: activeSystemIdentifier.skinCatalogSystemCode,
+                    activationContextSystemIdentifier: activeSystemIdentifier,
+                    activationContextGameId: emulatorVC.game.flatMap { $0.id.isEmpty ? nil : $0.id }
+                )
                     .toolbar {
                         ToolbarItem(placement: .topBarTrailing) {
                             Button(String(localized: "Done")) { showingSkinCatalog = false }

PVUI/Sources/PVUIBase/PVEmulatorVC/RetroMenuView.swift

@@ -12,6 +12,7 @@ import PVLogging
 import PVSettings
 import PVSupport
 import PVLibrary
+import PVPrimitives
 import PVFeatureFlags
 import UniformTypeIdentifiers
 import PVThemes
@@ -45,6 +46,21 @@ struct RetroMenuView: View {
 
     private var palette: UXThemePalette { themeManager.currentPalette }
 
+    /// Same resolution as the pause tile menu so catalog activation matches the running emulator’s `SystemIdentifier`.
+    private var skinCatalogActiveSystemIdentifier: SystemIdentifier {
+        let game = emulatorVC.game
+        let candidates: [String?] = [
+            game.system?.identifier,
+            game.systemIdentifier.isEmpty ? nil : game.systemIdentifier,
+            emulatorVC.core.systemIdentifier
+        ]
+        let parsed = candidates.compactMap { raw -> SystemIdentifier? in
+            guard let raw, !raw.isEmpty else { return nil }
+            return SystemIdentifier(rawValue: raw)
+        }
+        return parsed.first(where: { $0 != .RetroArch }) ?? parsed.first ?? .RetroArch
+    }
+
     /// Dismisses the menu without resuming emulation - use when opening sub-sheets that should keep the game paused
     private func dismissMenuForSubSheet() {
         dismissMenuForSubSheetThen {}
@@ -1626,7 +1642,9 @@ struct RetroMenuView: View {
                 }) {
                     NavigationStack {
                         SkinCatalogBrowserView(
-                            preselectedSystem: emulatorVC.game.system?.systemIdentifier.skinCatalogSystemCode ?? nil
+                            preselectedSystem: skinCatalogActiveSystemIdentifier.skinCatalogSystemCode,
+                            activationContextSystemIdentifier: skinCatalogActiveSystemIdentifier,
+                            activationContextGameId: emulatorVC.game.id.isEmpty ? nil : emulatorVC.game.id
                         )
                         .toolbar {
                             ToolbarItem(placement: .topBarTrailing) {

PVUI/Sources/PVUIBase/SwiftUI/DeltaSkins/Views/Catalog/SkinCatalogBrowserView.swift

@@ -20,14 +20,29 @@ public struct SkinCatalogBrowserView: View {
 
     #if os(tvOS)
     private let preselectedSystem: String?
-    public init(preselectedSystem: String? = nil) {
+    private let activationContextSystemIdentifier: SystemIdentifier?
+    private let activationContextGameId: String?
+    public init(
+        preselectedSystem: String? = nil,
+        activationContextSystemIdentifier: SystemIdentifier? = nil,
+        activationContextGameId: String? = nil
+    ) {
         self.preselectedSystem = preselectedSystem
+        self.activationContextSystemIdentifier = activationContextSystemIdentifier
+        self.activationContextGameId = activationContextGameId
     }
     public var body: some View {
-        TVOSSkinCatalogBrowserView(preselectedSystem: preselectedSystem)
+        TVOSSkinCatalogBrowserView(
+            preselectedSystem: preselectedSystem,
+            activationContextSystemIdentifier: activationContextSystemIdentifier,
+            activationContextGameId: activationContextGameId
+        )
     }
     #else
 
+    private let activationContextSystemIdentifier: SystemIdentifier?
+    private let activationContextGameId: String?
+
     // MARK: - State
 
     @State private var entries: [SkinCatalogEntry] = []
@@ -66,7 +81,14 @@ public struct SkinCatalogBrowserView: View {
     ///
     /// When `preselectedSystem` is non-nil the filter bar is shown automatically
     /// so the user immediately sees which system is active and can change it.
-    public init(preselectedSystem: String? = nil) {
+    /// Pass `activationContextSystemIdentifier` / `activationContextGameId` when presenting from gameplay so “Set as active skin” updates the running session.
+    public init(
+        preselectedSystem: String? = nil,
+        activationContextSystemIdentifier: SystemIdentifier? = nil,
+        activationContextGameId: String? = nil
+    ) {
+        self.activationContextSystemIdentifier = activationContextSystemIdentifier
+        self.activationContextGameId = activationContextGameId
         _selectedSystem = State(initialValue: preselectedSystem)
         _showingFilters = State(initialValue: preselectedSystem != nil)
         // Pre-select the device filter that matches the current hardware so
@@ -81,6 +103,15 @@ public struct SkinCatalogBrowserView: View {
         _selectedDevice = State(initialValue: defaultDevice)
     }
 
+    @ViewBuilder
+    private func catalogDetailDestination(for entry: SkinCatalogEntry) -> some View {
+        SkinCatalogDetailView(
+            entry: entry,
+            activationContextSystemIdentifier: activationContextSystemIdentifier,
+            activationContextGameId: activationContextGameId
+        )
+    }
+
     // MARK: - Body
 
     public var body: some View {
@@ -314,7 +345,7 @@ public struct SkinCatalogBrowserView: View {
             ) {
                 ForEach(entries) { entry in
                     let isInstalled = isSkinInstalled(entry)
-                    NavigationLink(destination: SkinCatalogDetailView(entry: entry)) {
+                    NavigationLink(destination: catalogDetailDestination(for: entry)) {
                         CatalogSkinCard(entry: entry, glowIntensity: glowIntensity, isInstalled: isInstalled)
                     }
                     .buttonStyle(PlainButtonStyle())

PVUI/Sources/PVUIBase/SwiftUI/DeltaSkins/Views/Catalog/SkinCatalogDetailView.swift

@@ -22,6 +22,10 @@ public struct SkinCatalogDetailView: View {
     // MARK: - Properties
 
     let entry: SkinCatalogEntry
+    /// When set (e.g. opened from pause while playing), preferences and notifications use this system so they match ``EmulatorWithSkinView``.
+    private let activationContextSystemIdentifier: SystemIdentifier?
+    /// When set, activation writes **game** scope so per-game prefs override any prior selection (system-only writes were ignored by the effective-skin chain).
+    private let activationContextGameId: String?
 
     // MARK: - State
 
@@ -52,6 +56,18 @@ public struct SkinCatalogDetailView: View {
         case failed(String)
     }
 
+    // MARK: - Init
+
+    public init(
+        entry: SkinCatalogEntry,
+        activationContextSystemIdentifier: SystemIdentifier? = nil,
+        activationContextGameId: String? = nil
+    ) {
+        self.entry = entry
+        self.activationContextSystemIdentifier = activationContextSystemIdentifier
+        self.activationContextGameId = activationContextGameId.flatMap { $0.isEmpty ? nil : $0 }
+    }
+
     // MARK: - Body
 
     public var body: some View {
@@ -347,7 +363,7 @@ public struct SkinCatalogDetailView: View {
                     )
                     .shadow(color: RetroTheme.retroPink.opacity(0.4), radius: 6)
 
-                    if let system = primarySystemIdentifier {
+                    if let system = resolvedSystemForActivation {
                         activateSkinButton(system: system)
                     }
                 }
@@ -604,6 +620,25 @@ public struct SkinCatalogDetailView: View {
         }.first
     }
 
+    /// System used for the activate button and for preference writes when the catalog was opened in-game.
+    private var resolvedSystemForActivation: SystemIdentifier? {
+        activationContextSystemIdentifier ?? primarySystemIdentifier
+    }
+
+    /// Order matters: prefer runtime context first, then catalog-derived id, so `DeltaSkinManager.skins(for:)` finds the install under the emulator’s system when they differ.
+    private var systemsToQueryForInstalledSkin: [SystemIdentifier] {
+        var result: [SystemIdentifier] = []
+        var seen = Set<SystemIdentifier>()
+        func appendUnique(_ id: SystemIdentifier?) {
+            guard let id, !seen.contains(id) else { return }
+            seen.insert(id)
+            result.append(id)
+        }
+        appendUnique(activationContextSystemIdentifier)
+        appendUnique(primarySystemIdentifier)
+        return result
+    }
+
     // MARK: - Installed Check
 
     /// Sets `downloadState` to `.installed` when the catalog entry matches a
@@ -723,19 +758,33 @@ public struct SkinCatalogDetailView: View {
             // Force a rescan so the just-installed skin is found
             await DeltaSkinManager.shared.reloadSkins()
 
-            let skins = try await DeltaSkinManager.shared.skins(for: system)
+            let querySystems = systemsToQueryForInstalledSkin.isEmpty ? [system] : systemsToQueryForInstalledSkin
+            var matchedSkin: DeltaSkinProtocol?
+            for sys in querySystems {
+                let skins = try await DeltaSkinManager.shared.skins(for: sys)
+                if let found = findMatchingInstalledSkin(for: entry, in: skins) {
+                    matchedSkin = found
+                    break
+                }
+            }
 
             guard !Task.isCancelled else { return }
 
-            guard let skin = findMatchingInstalledSkin(for: entry, in: skins) else {
-                // Log what we have vs what we're looking for
-                ELOG("activateSkin: skin '\(entry.name)' (id: \(entry.id)) not found. Available: \(skins.map { "\($0.name) (\($0.identifier))" })")
+            guard let skin = matchedSkin else {
+                ELOG("activateSkin: skin '\(entry.name)' (id: \(entry.id)) not found after querying systems: \(querySystems.map(\.rawValue))")
                 throw NSError(domain: "SkinCatalog", code: 1, userInfo: [NSLocalizedDescriptionKey: "Skin '\(entry.name)' not found after install. Try going back and re-entering."])
             }
 
+            // Must match EmulatorWithSkinView.systemId so selectionChangedNotification triggers a reload.
+            let prefSystem = activationContextSystemIdentifier ?? primarySystemIdentifier ?? system
             let manager = DeltaSkinSelectionManager.shared
-            await manager.setSkin(skin.identifier, for: system, orientation: .portrait, scope: .system)
-            await manager.setSkin(skin.identifier, for: system, orientation: .landscape, scope: .system)
+            if let gameId = activationContextGameId {
+                await manager.setSkin(skin.identifier, for: prefSystem, gameId: gameId, orientation: .portrait, scope: .game)
+                await manager.setSkin(skin.identifier, for: prefSystem, gameId: gameId, orientation: .landscape, scope: .game)
+            } else {
+                await manager.setSkin(skin.identifier, for: prefSystem, orientation: .portrait, scope: .system)
+                await manager.setSkin(skin.identifier, for: prefSystem, orientation: .landscape, scope: .system)
+            }
 
             guard !Task.isCancelled else { return }
 
@@ -744,7 +793,7 @@ public struct SkinCatalogDetailView: View {
                     activationState = .activated
                 }
             }
-            ILOG("SkinCatalogDetailView: Activated skin '\(skin.name)' for \(system)")
+            ILOG("SkinCatalogDetailView: Activated skin '\(skin.name)' for \(prefSystem) (gameId: \(activationContextGameId ?? "nil"))")
         } catch is CancellationError {
             // Task was cancelled (e.g. view dismissed) — don't update state
             return

PVUI/Sources/PVUIBase/SwiftUI/DeltaSkins/Views/Catalog/TVOSSkinCatalogBrowserView.swift

@@ -24,6 +24,9 @@ import PVLogging
 /// Download and install is handled by `SkinCatalogDetailView` via `DeltaSkinManager`.
 public struct TVOSSkinCatalogBrowserView: View {
 
+    private let activationContextSystemIdentifier: SystemIdentifier?
+    private let activationContextGameId: String?
+
     // MARK: - State
 
     @State private var catalog: [SkinCatalogEntry] = []
@@ -39,8 +42,23 @@ public struct TVOSSkinCatalogBrowserView: View {
     // MARK: - Init
 
     /// Creates the browser, optionally pre-filtering to a system.
-    public init(preselectedSystem: String? = nil) {
+    public init(
+        preselectedSystem: String? = nil,
+        activationContextSystemIdentifier: SystemIdentifier? = nil,
+        activationContextGameId: String? = nil
+    ) {
         _selectedSystem = State(initialValue: preselectedSystem)
+        self.activationContextSystemIdentifier = activationContextSystemIdentifier
+        self.activationContextGameId = activationContextGameId
+    }
+
+    @ViewBuilder
+    private func catalogDetailDestination(for entry: SkinCatalogEntry) -> some View {
+        SkinCatalogDetailView(
+            entry: entry,
+            activationContextSystemIdentifier: activationContextSystemIdentifier,
+            activationContextGameId: activationContextGameId
+        )
     }
 
     // MARK: - Derived data
@@ -220,7 +238,7 @@ public struct TVOSSkinCatalogBrowserView: View {
             ScrollView(.horizontal, showsIndicators: false) {
                 HStack(spacing: 24) {
                     ForEach(skins) { entry in
-                        NavigationLink(destination: SkinCatalogDetailView(entry: entry)) {
+                        NavigationLink(destination: catalogDetailDestination(for: entry)) {
                             TVOSSkinCard(entry: entry, glowIntensity: glowIntensity)
                         }
                         .retroFocusButtonStyle(focusScale: 1.08, cornerRadius: 16)
@@ -245,7 +263,7 @@ public struct TVOSSkinCatalogBrowserView: View {
                         spacing: 30
                     ) {
                         ForEach(searchResults) { entry in
-                            NavigationLink(destination: SkinCatalogDetailView(entry: entry)) {
+                            NavigationLink(destination: catalogDetailDestination(for: entry)) {
                                 TVOSSkinCard(entry: entry, glowIntensity: glowIntensity)
                             }
                             .retroFocusButtonStyle(focusScale: 1.08, cornerRadius: 16)

PVUI/Sources/PVUIBase/SwiftUI/DeltaSkins/Views/Display/EmulatorWithSkinView.swift

@@ -93,8 +93,8 @@ struct EmulatorWithSkinView: View {
         self.gameTitle = game.title
         self.systemName = game.system?.name
 
-        // Convert string system identifier to enum
-        self.systemId = game.system?.systemIdentifier
+        // Linked PVSystem is authoritative; fall back to persisted PVGame.systemIdentifier when the relationship is missing so skin reload notifications still match.
+        self.systemId = game.system?.systemIdentifier ?? SystemIdentifier(rawValue: game.systemIdentifier)
 
         // Get game ID for skin preferences (must match game.id used in skin selection)
         self.gameId = game.id