From e53ad0a63b299bf00f2137c3802b0a0424117649 Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 21 Nov 2016 16:05:02 +0000 Subject: [PATCH] lazutils: simplified git-svn-id: trunk@53403 - --- components/lazutils/fileutil.inc | 17 ++++++++--------- ide/lazarus.res | Bin 138984 -> 138984 bytes 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/components/lazutils/fileutil.inc b/components/lazutils/fileutil.inc index a5eba648d9..4eb25cca7a 100644 --- a/components/lazutils/fileutil.inc +++ b/components/lazutils/fileutil.inc @@ -958,17 +958,16 @@ begin if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='') then continue; - if LazFileUtils.CompareFilenamesIgnoreCase(FileInfo.Name,ShortFilename)=0 then begin - if FileInfo.Name=ShortFilename then begin - // fits exactly - //Don't return (unaltered) Filename: otherwise possible changes by ResolveDots get lost - Result:=CurDir+FileInfo.Name; - break; - end; - // fits case insensitive + if LazFileUtils.CompareFilenamesIgnoreCase(FileInfo.Name,ShortFilename)<>0 then + continue; + if FileInfo.Name=ShortFilename then begin + // fits exactly + //Don't return (unaltered) Filename: otherwise possible changes by ResolveDots get lost Result:=CurDir+FileInfo.Name; - // search further + break; end; + // fits case insensitive + Result:=CurDir+FileInfo.Name; until LazFileUtils.FindNextUTF8(FileInfo)<>0; end; LazFileUtils.FindCloseUTF8(FileInfo); diff --git a/ide/lazarus.res b/ide/lazarus.res index 161907e26d5b711d29c73fb2797bfb934c6883d1..a03aacae3c43c01c3ba91e62253fafddc87a06eb 100644 GIT binary patch delta 31 ncmaE{m*d4=jtv>?o9D1QFiy^3H)+1Z(SC=6ar+$(CLS>W*@p|+ delta 31 ncmaE{m*d4=jtv>?lUHzW+ZhYy