Skip to content

Commit e7ff78b

Browse files
committed
Addressed PR comments
1 parent 47db158 commit e7ff78b

File tree

8 files changed

+13
-10
lines changed

8 files changed

+13
-10
lines changed

src/components/buttons/CopyToClipboardButton.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts" setup>
2-
import InteractionProvider from "src/providers/ror2/system/InteractionProvider";
2+
import InteractionProvider from "../../providers/ror2/system/InteractionProvider";
33
import { ref } from "vue";
44
55
export type CopyToClipboardButtonProps = {

src/components/modals/launch-type/LaunchTypeModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {getLaunchType, LaunchType} from "../../../model/real_enums/launch/Launch
99
import {areWrapperArgumentsProvided, getDeterminedLaunchType, getWrapperLaunchArgs} from "../../../utils/LaunchUtils";
1010
import EnumResolver from "../../../model/enums/_EnumResolver";
1111
import CopyToClipboardButton from "../../buttons/CopyToClipboardButton.vue";
12-
import ManagerSettings from "src/r2mm/manager/ManagerSettings";
12+
import ManagerSettings from "../../../r2mm/manager/ManagerSettings";
1313
1414
const store = getStore<State>();
1515

src/model/real_enums/launch/LaunchType.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export async function getLaunchType(game: Game) {
1515
const settings = await ManagerSettings.getSingleton(game);
1616
const savedLaunchType = settings.getContext().gameSpecific.launchType;
1717
if (savedLaunchType !== undefined) {
18-
return EnumResolver.from<LaunchType>(LaunchType, settings.getContext().gameSpecific.launchType);
18+
return EnumResolver.from<LaunchType>(LaunchType, savedLaunchType);
1919
}
2020
}
2121
return EnumResolver.from<LaunchType>(LaunchType, LaunchType.AUTO);

src/pages/Manager.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<DownloadProgressModal />
129129
<DownloadModVersionSelectModal />
130130
<UpdateAllInstalledModsModal />
131-
<LaunchTypeModal/>
131+
<LaunchTypeModal v-if="canRenderLaunchTypeModal"/>
132132

133133
<div class="router-view">
134134
<router-view name="subview" v-on:setting-invoked="handleSettingsCallbacks($event)" />
@@ -190,6 +190,10 @@ const settings = computed(() => store.getters['settings']);
190190
const profile = computed(() => store.getters['profile/activeProfile']);
191191
const localModList = computed(() => store.state.profile.modList);
192192
193+
function canRenderLaunchTypeModal() {
194+
return ['linux', 'darwin'].includes(process.platform);
195+
}
196+
193197
function closeSteamInstallationValidationModal() {
194198
isValidatingSteamInstallation.value = false;
195199
}

src/r2mm/launching/runners/linux/SteamGameRunner_Linux.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { exec } from 'child_process';
1212
import GameInstructions from '../../instructions/GameInstructions';
1313
import GameInstructionParser from '../../instructions/GameInstructionParser';
1414
import { PackageLoader } from '../../../../model/schema/ThunderstoreSchema';
15-
import {isProtonRequired} from "src/utils/LaunchUtils";
15+
import {isProtonRequired} from "../../../../utils/LaunchUtils";
1616

1717
export default class SteamGameRunner_Linux extends GameRunnerProvider {
1818

src/r2mm/manager/ManagerSettings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import SettingsDexieStore, { ManagerSettingsInterfaceHolder } from './SettingsDe
77
import Game from '../../model/game/Game';
88
import { Platform } from '../../model/schema/ThunderstoreSchema';
99
import { GameSelectionViewMode } from '../../model/enums/GameSelectionViewMode';
10-
import {LaunchType} from "src/model/real_enums/launch/LaunchType";
10+
import { LaunchType } from "../../model/real_enums/launch/LaunchType";
1111

1212
export default class ManagerSettings {
1313

src/r2mm/manager/linux/GameDirectoryResolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import Game from '../../../model/game/Game';
1212
import GameManager from '../../../model/game/GameManager';
1313
import { getPropertyFromPath } from '../../../utils/Common';
1414
import DepotLoader from '../../../depots/loader/DepotLoader';
15-
import {getLaunchType, LaunchType} from "src/model/real_enums/launch/LaunchType";
16-
import EnumResolver from "src/model/enums/_EnumResolver";
15+
import {getLaunchType, LaunchType} from "../../../model/real_enums/launch/LaunchType";
16+
import EnumResolver from "../../../model/enums/_EnumResolver";
1717

1818
const FORCE_PROTON_FILENAME = ".forceproton";
1919

src/utils/LaunchUtils.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import {Platform} from '../assets/data/ecosystemTypes';
1010
import LinuxGameDirectoryResolver from '../r2mm/manager/linux/GameDirectoryResolver';
1111
import {LaunchType} from "../model/real_enums/launch/LaunchType";
1212
import path from "path";
13-
import PathResolver from "src/r2mm/manager/PathResolver";
14-
import {computed} from "vue";
13+
import PathResolver from "../r2mm/manager/PathResolver";
1514

1615
export enum LaunchMode { VANILLA, MODDED };
1716

0 commit comments

Comments
 (0)