[OMPT-svn-commit] SF.net SVN: modplug:[850] trunk/OpenMPT/mptrack/View_pat.cpp

[<sag...@us...>]

Revision: 850
          http://modplug.svn.sourceforge.net/modplug/?rev=850&view=rev
Author:   saga-games
Date:     2011-04-13 00:44:30 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
[Fix] Reverted an unintended behaviour change introduced in rev.848

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/View_pat.cpp

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2011-04-12 23:03:37 UTC (rev 849)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2011-04-13 00:44:30 UTC (rev 850)
@@ -1026,11 +1026,10 @@
 	CModDoc *pModDoc = GetDocument();
 	if (/*(m_bDragging) ||*/ (pModDoc == nullptr) || (pModDoc->GetSoundFile() == nullptr)) return;
 	SetFocus();
-	m_nDragItem = GetDragItem(point, &m_rcDragItem);
+	m_nDropItem = m_nDragItem = GetDragItem(point, &m_rcDragItem);
 	m_bDragging = true;
 	m_bInItemRect = true;
 	m_bShiftDragging = false;
-	m_nDropItem = 0;
 
 	SetCapture();
 	if ((point.x >= m_szHeader.cx) && (point.y <= m_szHeader.cy))
@@ -1165,8 +1164,8 @@
 	}
 	if ((!bItemSelected) || (!m_nDragItem)) return;
 	InvalidateRect(&m_rcDragItem, FALSE);
-	const DWORD nItemNo = (m_nDragItem & DRAGITEM_VALUEMASK);
-	const DWORD nTargetNo = (m_nDropItem != 0) ? (m_nDropItem & DRAGITEM_VALUEMASK) : nItemNo;
+	const CHANNELINDEX nItemNo = (m_nDragItem & DRAGITEM_VALUEMASK);
+	const CHANNELINDEX nTargetNo = (m_nDropItem != 0) ? (m_nDropItem & DRAGITEM_VALUEMASK) : CHANNELINDEX_INVALID;
 
 	switch(m_nDragItem & DRAGITEM_MASK)
 	{


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