[Winmerge-svn] SF.net SVN: winmerge: [4148] branches/R2_6/Src

[<sdo...@us...>]

Revision: 4148
          http://svn.sourceforge.net/winmerge/?rev=4148&view=rev
Author:   sdottaka
Date:     2007-03-07 12:10:21 -0800 (Wed, 07 Mar 2007)

Log Message:
-----------
PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/DirView.cpp

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2007-03-07 20:09:46 UTC (rev 4147)
+++ branches/R2_6/Src/Changes.txt	2007-03-07 20:10:21 UTC (rev 4148)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2007-03-07 Takashi
+ PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
+  Src/DirView.cpp
+
 2007-03-04 Kimmo
  BUG: [ 1664832 ] Typo Error in the Registry
   ShellExtension: WinMergeShell.rgs

Modified: branches/R2_6/Src/DirView.cpp
===================================================================
--- branches/R2_6/Src/DirView.cpp	2007-03-07 20:09:46 UTC (rev 4147)
+++ branches/R2_6/Src/DirView.cpp	2007-03-07 20:10:21 UTC (rev 4148)
@@ -2702,6 +2702,8 @@
 	while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
 	{
 		POSITION pos = GetItemKey(sel);
+		if (pos == (POSITION) SPECIAL_ITEM_POS)
+			continue;
 		pDoc->SetItemViewFlag(pos, ViewCustomFlags::HIDDEN, ViewCustomFlags::VISIBILITY);
 		m_pList->DeleteItem(sel--);
 		m_nHiddenItems++;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.