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

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

Revision: 660
          http://modplug.svn.sourceforge.net/modplug/?rev=660&view=rev
Author:   saga-games
Date:     2010-07-23 23:58:27 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
[Fix] Pattern Editor: Shortcut for toggling record state didn't save the change, so it was reset with every new module.
[Mod] OpenMPT: Version is now 1.18.02.06

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_pat.cpp
    trunk/OpenMPT/mptrack/version.h

Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp	2010-07-23 23:57:46 UTC (rev 659)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp	2010-07-23 23:58:27 UTC (rev 660)
@@ -323,11 +323,11 @@
 		}
 		if (dwHintMask & (HINT_MODTYPE|HINT_PATNAMES))
 		{
-			UINT nPat;
-			if (dwHintMask&HINT_PATNAMES)
-				nPat = (dwHintMask >> HINT_SHIFT_PAT);
+			PATTERNINDEX nPat;
+			if (dwHintMask & HINT_PATNAMES)
+				nPat = (PATTERNINDEX)(dwHintMask >> HINT_SHIFT_PAT);
 			else
-				nPat = SendViewMessage(VIEWMSG_GETCURRENTPATTERN);
+				nPat = (PATTERNINDEX)SendViewMessage(VIEWMSG_GETCURRENTPATTERN);
 			m_pSndFile->GetPatternName(nPat, s, sizeof(s));
 			m_EditPatName.SetWindowText(s);
 			BOOL bXMIT = (m_pSndFile->m_nType & (MOD_TYPE_XM|MOD_TYPE_IT|MOD_TYPE_MPT)) ? TRUE : FALSE;
@@ -436,6 +436,7 @@
 	case CTRLMSG_SETRECORD:
 		if (lParam >= 0) m_bRecord = (BOOL)(lParam); else m_bRecord = !m_bRecord;
 		m_ToolBar.SetState(IDC_PATTERN_RECORD, ((m_bRecord) ? TBSTATE_CHECKED : 0)|TBSTATE_ENABLED);
+		CMainFrame::gbPatternRecord = m_bRecord;
 		SendViewMessage(VIEWMSG_SETRECORD, m_bRecord);
 		break;
 
@@ -927,7 +928,7 @@
 {
 	UINT nState = m_ToolBar.GetState(IDC_PATTERN_RECORD);
 	m_bRecord = ((nState & TBSTATE_CHECKED) != 0);
-	CMainFrame::gbPatternRecord=m_bRecord;
+	CMainFrame::gbPatternRecord = m_bRecord;
 	SendViewMessage(VIEWMSG_SETRECORD, m_bRecord);
 	SwitchToView();
 }

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2010-07-23 23:57:46 UTC (rev 659)
+++ trunk/OpenMPT/mptrack/version.h	2010-07-23 23:58:27 UTC (rev 660)
@@ -15,7 +15,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					18
 #define VER_MINOR					02
-#define VER_MINORMINOR				05
+#define VER_MINORMINOR				06
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 


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