From 91a11bffcf6cce91ae5ac05cefad8a5ecf08cde9 Mon Sep 17 00:00:00 2001 From: Ulf Wohlers Date: Sun, 11 May 2003 16:50:21 +0000 Subject: [PATCH] Fixed bug in returning disc label Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1004 --- src/dos/drive_local.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/dos/drive_local.cpp b/src/dos/drive_local.cpp index 3e3a3ebf..991a9dbc 100644 --- a/src/dos/drive_local.cpp +++ b/src/dos/drive_local.cpp @@ -120,10 +120,13 @@ bool localDrive::FindFirst(char * _dir,DOS_DTA & dta) { Bit8u sAttr; dta.GetSearchParams(sAttr,tempDir); - if (sAttr & DOS_ATTR_VOLUME) { - // Get Volume Label - dta.SetResult(dirCache.GetLabel(),0,0,0,DOS_ATTR_VOLUME); - return true; + if ((sAttr & DOS_ATTR_VOLUME) && (*_dir==0)) { + // Get Volume Label (DOS_ATTR_VOLUME) and only in basedir + if (WildFileCmp(dirCache.GetLabel(),tempDir)) { + // Get Volume Label + dta.SetResult(dirCache.GetLabel(),0,0,0,DOS_ATTR_VOLUME); + return true; + } } return FindNext(dta); }