[Winmerge-svn] SF.net SVN: winmerge:[5740] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <sdo...@us...> - 2008-08-06 15:33:18
|
Revision: 5740 http://winmerge.svn.sourceforge.net/winmerge/?rev=5740&view=rev Author: sdottaka Date: 2008-08-06 15:33:15 +0000 (Wed, 06 Aug 2008) Log Message: ----------- BUG: [ 2025833 ] Deleting/Moving file crashes WinMerge in debugger Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/DirActions.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2008-08-05 21:27:38 UTC (rev 5739) +++ trunk/Docs/Users/ChangeLog.txt 2008-08-06 15:33:15 UTC (rev 5740) @@ -5,6 +5,7 @@ WinMerge 2.11.1.4 BugFix: External editor command line switches did not work (#2037862) + BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) WinMerge 2.11.1.3 - 2008-08-04 (r5733) Rename color scheme menu item "None" and add separator (#2027300) @@ -507,4 +508,4 @@ WinMerge 2.7.4 and earlier (also 2.6.x stable releases) have more detailed -changelogs in Changes.txt files in /Src and other folders. +changelogs in Changes.txt files in /Src and other folders. \ No newline at end of file Modified: trunk/Src/DirActions.cpp =================================================================== --- trunk/Src/DirActions.cpp 2008-08-05 21:27:38 UTC (rev 5739) +++ trunk/Src/DirActions.cpp 2008-08-06 15:33:15 UTC (rev 5740) @@ -994,7 +994,7 @@ // doesn't invalidate our item indexes. FileActionItem act = actionList.RemoveTailActionItem(); POSITION diffpos = GetItemKey(act.context); - const DIFFITEM & di = pDoc->GetDiffByKey(diffpos); + DIFFCODE diffcode = pDoc->GetDiffByKey(diffpos).diffcode; BOOL bUpdateLeft = FALSE; BOOL bUpdateRight = FALSE; @@ -1021,7 +1021,7 @@ break; case FileActionItem::UI_DEL_LEFT: - if (di.diffcode.isSideLeftOnly()) + if (diffcode.isSideLeftOnly()) { m_pList->DeleteItem(act.context); bItemsRemoved = TRUE; @@ -1033,7 +1033,7 @@ break; case FileActionItem::UI_DEL_RIGHT: - if (di.diffcode.isSideRightOnly()) + if (diffcode.isSideRightOnly()) { m_pList->DeleteItem(act.context); bItemsRemoved = TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |