From 18f13c2b60b86e913a7949de5726bd17ecd79afc Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Sun, 8 Aug 2004 12:39:54 +0000 Subject: [PATCH] Ignore requested drive_label when searching for it. Fixes pandaro. (Thank you prompt) Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1903 --- src/dos/drive_local.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/dos/drive_local.cpp b/src/dos/drive_local.cpp index 29ebaf9a..dffa7cf9 100644 --- a/src/dos/drive_local.cpp +++ b/src/dos/drive_local.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: drive_local.cpp,v 1.49 2004-08-04 09:12:53 qbix79 Exp $ */ +/* $Id: drive_local.cpp,v 1.50 2004-08-08 12:39:54 qbix79 Exp $ */ #include #include @@ -160,12 +160,9 @@ bool localDrive::FindFirst(char * _dir,DOS_DTA & dta,bool fcb_findfirst) { dta.SetResult("NO_LABEL",0,0,0,DOS_ATTR_VOLUME); return true; } - - if (WildFileCmp(dirCache.GetLabel(),tempDir)) { - // Get Volume Label - dta.SetResult(dirCache.GetLabel(),0,0,0,DOS_ATTR_VOLUME); - return true; - } + // Get Volume Label && ignore search string (pandora) + dta.SetResult(dirCache.GetLabel(),0,0,0,DOS_ATTR_VOLUME); + return true; } return FindNext(dta); }