From b8993f8321a5f32c81b9b616507915e2440338a2 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sat, 9 May 2009 09:13:26 +0000 Subject: [PATCH] BUG: [ 2789348 ] File wm_*.* in temporary folder causes an infinite loop --- Docs/Users/ChangeLog.txt | 3 ++- Src/TempFile.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 0def0bb87..6c632723c 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -11,7 +11,8 @@ WinMerge 2.13.7 Bugfix: Diff view highlighted last char diff incorrectly (#2785186) Bugfix: Could select prediffer when plugins were disabled (#2787131) Bugfix: File compare HTML reports use invald DOCTYPE (#2783477) - Bugfix: "##" in file filter pattern caused an infinite loop (#2789348) + Bugfix: "##" in file filter pattern caused an infinite loop (#2789345) + Bugfix: File wm_*.* in temporary folder caused an infinite loop (#2789348) WinMerge 2.13.6 - 2009-04-16 (r6665) Show deleted differences in difference highlight with own diff --git a/Src/TempFile.cpp b/Src/TempFile.cpp index 50d85a485..d19be4882 100644 --- a/Src/TempFile.cpp +++ b/Src/TempFile.cpp @@ -193,8 +193,8 @@ BOOL CleanupWMtempfolder(vector processIDs) } continue; } - bok = FindNextFile(h, &ff) ; } + bok = FindNextFile(h, &ff) ; } if (h) FindClose(h); -- 2.11.0