Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FDC hacks to deal with recent disk path changes and disk file name case changes

Browse source
This commit is contained in:
Jeff Parsons 2016-05-20 08:47:49 -07:00
commit e8ba4aedc5
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/pcx86/lib/fdc.js
View file

@ -1400,8 +1400,16 @@ FDC.prototype.loadDiskette = function(iDrive, sDisketteName, sDiskettePath, fAut
{ {
var drive = this.aDrives[iDrive]; var drive = this.aDrives[iDrive];
if (sDiskettePath) { if (sDiskettePath) {
/*
* TODO: This code contains two hacks that should eventually be eliminated: first, machines
* with saved states may attempt to load disks using old paths, so we replace the old path
* with the new, and second, they be using lower-case disk image names, whereas we now use
* UPPER-CASE names for disk images, so we lower-case both before comparing. The only problem
* with removing these hacks is that we can never be sure when all saved states in the wild
* have been updated....
*/
sDiskettePath = sDiskettePath.replace("/disks/pc/", "/disks/pcx86/"); sDiskettePath = sDiskettePath.replace("/disks/pc/", "/disks/pcx86/");
if (drive.sDiskettePath != sDiskettePath) { if (drive.sDiskettePath.toLowerCase() != sDiskettePath.toLowerCase()) {
this.unloadDrive(iDrive, fAutoMount, true); this.unloadDrive(iDrive, fAutoMount, true);
if (drive.fBusy) { if (drive.fBusy) {
this.notice("Drive " + iDrive + " busy"); this.notice("Drive " + iDrive + " busy");