[Winmerge-svn] SF.net SVN: winmerge: [4229] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2007-04-03 19:35:33
|
Revision: 4229 http://svn.sourceforge.net/winmerge/?rev=4229&view=rev Author: kimmov Date: 2007-04-03 12:35:32 -0700 (Tue, 03 Apr 2007) Log Message: ----------- BUG: [ 1693441 ] Compare by date (and size) broken in 2.7.3.2 Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/DiffContext.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2007-04-03 19:04:01 UTC (rev 4228) +++ trunk/Src/Changes.txt 2007-04-03 19:35:32 UTC (rev 4229) @@ -5,6 +5,8 @@ 2007-04-03 Kimmo PATCH: [ 1693113 ] Enable ShellExtension for folder backgrounds ShellExtension: WinMergeShell.cpp WinMergeShell.rgs + BUG: [ 1693441 ] Compare by date (and size) broken in 2.7.3.2 + Src: DiffContext.cpp 2007-04-03 Takashi BUG: [ 1693275 ] File extension filter does not work correctly Modified: trunk/Src/DiffContext.cpp =================================================================== --- trunk/Src/DiffContext.cpp 2007-04-03 19:04:01 UTC (rev 4228) +++ trunk/Src/DiffContext.cpp 2007-04-03 19:35:32 UTC (rev 4229) @@ -262,7 +262,17 @@ m_pCompareOptions = GetCompareOptions(compareMethod); if (m_pCompareOptions == NULL) - return FALSE; + { + // For Date and Date+Size compare NULL is ok since they don't have actual + // compare options. + if (compareMethod == CMP_DATE || compareMethod == CMP_DATE_SIZE || + compareMethod == CMP_SIZE) + { + return TRUE; + } + else + return FALSE; + } return TRUE; } @@ -297,10 +307,11 @@ break; } + m_nCompMethod = compareMethod; + if (m_pCompareOptions == NULL) return NULL; - m_nCompMethod = compareMethod; m_pCompareOptions->SetFromDiffOptions(*m_pOptions); return m_pCompareOptions; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |