Merge pull request #1857 from ebkr/remember-last-platform-selected

Platform selection radio now persists last selected option

Author: ebkr

src/pages/GameSelectionScreen.vue

@@ -240,7 +240,15 @@ function selectGame(game: Game) {
     selectedGame.value = game;
     isSettingDefaultPlatform.value = false;
     if (game.storePlatformMetadata.length > 1) {
-        selectedPlatform.value = null;
+        ManagerSettings.getSingleton(game)
+            .then(settings => settings.getLastSelectedPlatform())
+            .then(platform => {
+                if (platform) {
+                    selectedPlatform.value = Platform[platform]
+                } else {
+                    selectedPlatform.value = null;
+                }
+            });
         showPlatformModal.value = true;
     } else {
         selectedPlatform.value = game.storePlatformMetadata[0].storePlatform;
@@ -297,6 +305,7 @@ async function proceed() {
 
     const settings = await ManagerSettings.getSingleton(selectedGame.value);
     await settings.setLastSelectedGame(selectedGame.value);
+    await settings.setLastSelectedPlatform(selectedPlatform.value);
     await GameManager.activate(selectedGame.value, selectedPlatform.value);
     await store.dispatch("setActiveGame", selectedGame.value);
 
@@ -312,7 +321,7 @@ async function proceedDefault() {
     await settings.setDefaultGame(selectedGame.value);
     await settings.setDefaultStorePlatform(selectedPlatform.value);
 
-    proceed();
+    return proceed();
 }
 
 function toggleFavourite(game: Game) {

src/r2mm/manager/ManagerSettings.ts

@@ -172,6 +172,13 @@ export default class ManagerSettings {
         return undefined;
     }
 
+    public getLastSelectedPlatform(): Platform | null {
+        if (ManagerSettings.CONTEXT.gameSpecific.lastSelectedPlatform) {
+            return EnumResolver.from<Platform>(Platform, ManagerSettings.CONTEXT.gameSpecific.lastSelectedPlatform);
+        }
+        return null;
+    }
+
     public async setInstalledDisablePosition(disablePosition: string) {
         ManagerSettings.CONTEXT.gameSpecific.installedDisablePosition = EnumResolver.from<SortLocalDisabledMods>(SortLocalDisabledMods, disablePosition);
         await this.save();
@@ -210,4 +217,9 @@ export default class ManagerSettings {
         ManagerSettings.CONTEXT.gameSpecific.launchType = launchType;
         await this.save();
     }
+
+    public async setLastSelectedPlatform(platform: Platform) {
+        ManagerSettings.CONTEXT.gameSpecific.lastSelectedPlatform = platform;
+        await this.save();
+    }
 }

src/r2mm/manager/SettingsDexieStore.ts

@@ -132,6 +132,7 @@ export default class SettingsDexieStore extends Dexie {
                 launchParameters: "",
                 linkedFiles: [],
                 launchType: LaunchType.AUTO,
+                lastSelectedPlatform: null,
             }
         }
     }
@@ -214,6 +215,7 @@ export interface ManagerSettingsInterfaceGame_V2 {
     installedSortDirection: string;
     installedDisablePosition: string;
     launchType: string;
+    lastSelectedPlatform: string | null;
 }
 
 /**