Bugfix: Don't prefix subdirectories with dot in ColPathGet.

diff --git a/Src/DirViewColItems.cpp b/Src/DirViewColItems.cpp
index 0a5132b..2c8ca08 100644 (file)
--- a/Src/DirViewColItems.cpp
+++ b/Src/DirViewColItems.cpp
@@ -47,9 +47,10 @@ static CString ColNameGet(const DIFFITEM & di)
 }
 static CString ColPathGet(const DIFFITEM & di)
 {
-       CString s = _T(".");
-       s += di.sSubdir;
-       return s;
+       if (di.sSubdir.IsEmpty())
+               return _T(".");
+       else
+               return di.sSubdir;
 }
 static CString ColStatusGet(const DIFFITEM & di)
 {

diff --git a/Src/readme.txt b/Src/readme.txt
index a4cf9bf..1181417 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -15,6 +15,8 @@
    DirViewColItems.cpp DirViewColItems.h
  Bugfix: CDiffContext::AddDiff was not setting diff context subdir from argument.
   WinMerge:: DiffContext.cpp
+ Bugfix: Don't prefix subdirectories with dot in ColPathGet.
+  WinMerge: DirViewColItems.cpp
 
 2003-08-22 Kimmo
  PATCH: [ 787495 ] Create diffutils class (CDiffWrapper)