[Winmerge-svn] SF.net SVN: winmerge: [4856] trunk

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

Revision: 4856
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4856&view=rev
Author:   sdottaka
Date:     2008-01-05 04:45:34 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
BUG: [ 1864040 ] Crash when using TrackPoint middle-button scrolling

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/Common/SplitterWndEx.cpp

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-04 15:55:30 UTC (rev 4855)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-05 12:45:34 UTC (rev 4856)
@@ -4,6 +4,7 @@
 
 WinMerge 2.7.7.2
   Syntax highlighting for PowerShell files (#1859657)
+  BugFix: Crash when using TrackPoint middle-button scrolling (#1864040)
 
 WinMerge 2.7.7.1 - 2007-12-20 (r4842)
   New option to keep file's time when saving in file compare (#1851921)

Modified: trunk/Src/Common/SplitterWndEx.cpp
===================================================================
--- trunk/Src/Common/SplitterWndEx.cpp	2008-01-04 15:55:30 UTC (rev 4855)
+++ trunk/Src/Common/SplitterWndEx.cpp	2008-01-05 12:45:34 UTC (rev 4856)
@@ -114,13 +114,14 @@
   // scroll bar)
   if (pScrollBar == NULL)
     return;
-	// maintain original synchronization functionality (all panes left from the scrollbar)
-	CSplitterWnd::OnVScroll(nSBCode, nPos, pScrollBar);
 
 	// only sync if shared vertical bars
 	if((GetScrollStyle()&WS_VSCROLL) == 0)
 		return;
 
+	// maintain original synchronization functionality (all panes left from the scrollbar)
+	CSplitterWnd::OnVScroll(nSBCode, nPos, pScrollBar);
+
 	// enhance with proportional vertical scroll synchronization
 	ASSERT(pScrollBar != NULL);
 	int curRow = ::GetDlgCtrlID(pScrollBar->m_hWnd) - AFX_IDW_VSCROLL_FIRST;


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