Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sijmen 2021-01-06 05:34:11 +01:00
commit d8022f8cf8
Signed by: vijfhoek
GPG key ID: DAF7821E067D9C48
2 changed files with 3 additions and 3 deletions

View file

@ -240,7 +240,7 @@ bool DiskImage::OpenD64(const FILINFO* fileInfo, unsigned char* diskImage, unsig
break;
default: // non-standard images, attempt to load anyway
last_track = 40;
last_track = MAX_TRACK_D64;
break;
}

View file

@ -28,9 +28,9 @@
/* D64 constants */
#define BLOCKSONDISK (17*21 + 7*19 + 6*18 + 5*17)
#define BLOCKSEXTRA (5*17)
#define BLOCKSEXTRA (5*17 + 2*17)
#define MAXBLOCKSONDISK (BLOCKSONDISK+BLOCKSEXTRA)
#define MAX_TRACK_D64 40
#define MAX_TRACK_D64 42
/* G64 constants (only needed for current VICE support */
#define G64_TRACK_MAXLEN 7928