Merge pull request #4703 from nanshiki/dpbmediaid

Fixed incorrect position for writing Media ID
joncampbell123 · Dec 24, 2023 · 6f35373 · 6f35373
2 parents 479eb28 + 773697b
commit 6f35373
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/dos/dos_files.cpp b/src/dos/dos_files.cpp
@@ -2357,7 +2357,7 @@ void unmount(int lcv) {
         if (cdrom) IDE_CDROM_Detach(lcv);
         Drives[lcv]=0;
         DOS_EnableDriveMenu('A'+lcv);
-        mem_writeb(Real2Phys(dos.tables.mediaid)+(unsigned int)'A'+lcv*dos.tables.dpb_size,0);
+        mem_writeb(Real2Phys(dos.tables.mediaid)+lcv*dos.tables.dpb_size,0);
     }
 }
 

diff --git a/src/dos/dos_programs.cpp b/src/dos/dos_programs.cpp
@@ -373,7 +373,7 @@ void MountHelper(char drive, const char drive2[DOS_PATHLENGTH], std::string cons
 	if (!newdrive) E_Exit("DOS:Can't create drive");
 	Drives[drive-'A']=newdrive;
 	DOS_EnableDriveMenu(drive);
-	mem_writeb(Real2Phys(dos.tables.mediaid)+(drive-'A')*2,mediaid);
+	mem_writeb(Real2Phys(dos.tables.mediaid)+(drive-'A')*dos.tables.dpb_size,mediaid);
 	if(drive_type=="CDROM")
 		LOG_MSG("GUI: Drive %c is mounted as CD-ROM",drive);
 	else
@@ -488,7 +488,7 @@ void MenuMountDrive(char drive, const char drive2[DOS_PATHLENGTH]) {
 	if(error && (type==DRIVE_CDROM)) return;
 	Drives[drive-'A']=newdrive;
 	DOS_EnableDriveMenu(drive);
-	mem_writeb(Real2Phys(dos.tables.mediaid)+(drive-'A')*2,mediaid);
+	mem_writeb(Real2Phys(dos.tables.mediaid)+(drive-'A')*dos.tables.dpb_size,mediaid);
     if(type == DRIVE_CDROM) LOG_MSG("GUI: Drive %c is mounted as CD-ROM %c:\\", drive, drive);
     else LOG_MSG("GUI: Drive %c is mounted as local directory %c:\\", drive, drive);
     if(drive == drive2[0] && strlen(drive2) == 3) {