From ad12df4c259342843314cb521de6b9770451d034 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Thu, 23 Aug 2012 04:26:32 +0000 Subject: [PATCH] CDROMs are handled differently with no label supplied (see findfirst in drive_local.cpp). Improves College Slam. (thanks ripsaw for spotting this) Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3794 --- src/dos/drive_iso.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/dos/drive_iso.cpp b/src/dos/drive_iso.cpp index 73bbad7e..00e120d6 100644 --- a/src/dos/drive_iso.cpp +++ b/src/dos/drive_iso.cpp @@ -255,13 +255,8 @@ bool isoDrive::FindFirst(char *dir, DOS_DTA &dta, bool fcb_findfirst) { dta.GetSearchParams(attr, pattern); if (attr == DOS_ATTR_VOLUME) { - if (strlen(discLabel) != 0) { - dta.SetResult(discLabel, 0, 0, 0, DOS_ATTR_VOLUME); - return true; - } else { - DOS_SetError(DOSERR_NO_MORE_FILES); - return false; - } + dta.SetResult(discLabel, 0, 0, 0, DOS_ATTR_VOLUME); + return true; } else if ((attr & DOS_ATTR_VOLUME) && isRoot && !fcb_findfirst) { if (WildFileCmp(discLabel,pattern)) { // Get Volume Label (DOS_ATTR_VOLUME) and only in basedir and if it matches the searchstring