Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions frontend/src/console/views/Play.vue
Original file line number Diff line number Diff line change
Expand Up @@ -419,12 +419,20 @@ async function boot() {
}

// Disc selection persistence
const discId = playerStorage.disc.value
const storedDiscId = playerStorage.disc.value
? parseInt(playerStorage.disc.value)
: null;
const validDiscId =
storedDiscId && rom.files.some((f) => f.id === storedDiscId)
? storedDiscId
: null;
// Clear stale disc selection from localStorage
if (storedDiscId && !validDiscId) {
playerStorage.disc.value = null;
}
window.EJS_gameUrl = getDownloadPath({
rom: rom,
fileIDs: discId ? [discId] : [],
fileIDs: validDiscId ? [validDiscId] : [],
});

// BIOS selection persistence
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/views/Player/EmulatorJS/Base.vue
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,11 @@ onMounted(async () => {
}

const storedDisc = localStorage.getItem(`player:${rom.value.id}:disc`);
if (storedDisc) {
selectedDisc.value = parseInt(storedDisc);
const storedDiscId = storedDisc ? parseInt(storedDisc) : null;
if (storedDiscId && rom.value.files.some((f) => f.id === storedDiscId)) {
selectedDisc.value = storedDiscId;
} else {
if (storedDisc) localStorage.removeItem(`player:${rom.value.id}:disc`);
selectedDisc.value = rom.value.files[0]?.id ?? null;
}

Expand Down
Loading