|
From: <ki...@us...> - 2006-12-11 22:33:10
|
Revision: 3946
http://svn.sourceforge.net/winmerge/?rev=3946&view=rev
Author: kimmov
Date: 2006-12-11 14:18:50 -0800 (Mon, 11 Dec 2006)
Log Message:
-----------
Fix error in logical condition for checking if item is directory
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileInfo.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-11 22:12:20 UTC (rev 3945)
+++ trunk/Src/Changes.txt 2006-12-11 22:18:50 UTC (rev 3946)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-11 Kimmo
+ Fix error in logical condition for checking if item is directory
+ Src: FileInfo.cpp
+
2006-12-10 Gal
BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
Modified: trunk/Src/FileInfo.cpp
===================================================================
--- trunk/Src/FileInfo.cpp 2006-12-11 22:12:20 UTC (rev 3945)
+++ trunk/Src/FileInfo.cpp 2006-12-11 22:18:50 UTC (rev 3946)
@@ -53,7 +53,7 @@
mtime64 = fstats.st_mtime;
// No size for directory ( size remains as -1)
- if ((fstats.st_mode | _S_IFDIR) != 0)
+ if ((fstats.st_mode & _S_IFDIR) == 0)
size = fstats.st_size;
flags.attributes = GetFileAttributes(sFilePath);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
