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

[<rel...@us...>]

Revision: 258
          http://modplug.svn.sourceforge.net/modplug/?rev=258&view=rev
Author:   relabsoluness
Date:     2009-05-17 14:54:05 +0000 (Sun, 17 May 2009)

Log Message:
-----------
. Pattern tab: Fix to possible crash when using undo after pattern resize (bug introduced in rev. 168). 
./ Miscellaneous tweaks (typo fixes etc.).

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Modedit.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/dlg_misc.cpp

Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp	2009-05-09 23:01:26 UTC (rev 257)
+++ trunk/OpenMPT/mptrack/Modedit.cpp	2009-05-17 14:54:05 UTC (rev 258)
@@ -2093,10 +2093,11 @@
 			MODCOMMAND *newPattern = CSoundFile::AllocatePattern(nRows, m_SndFile.m_nChannels);
 			MODCOMMAND *oldPattern = m_SndFile.Patterns[nPattern];
 			if (!newPattern) return (UINT)-1;
+			const ROWINDEX nOldRowCount = m_SndFile.Patterns[nPattern].GetNumRows();
 			m_SndFile.Patterns[nPattern].SetData(newPattern, nRows);
 			if (oldPattern)
 			{
-				memcpy(newPattern, oldPattern, m_SndFile.m_nChannels*m_SndFile.PatternSize[nPattern]*sizeof(MODCOMMAND));
+				memcpy(newPattern, oldPattern, m_SndFile.m_nChannels*nOldRowCount*sizeof(MODCOMMAND));
 				CSoundFile::FreePattern(oldPattern);
 			}
 		}

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2009-05-09 23:01:26 UTC (rev 257)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2009-05-17 14:54:05 UTC (rev 258)
@@ -231,9 +231,9 @@
 				"    [Mod] mptm files made with this version will be recognized as IT in 1.17.02.48.\n"
 			    "    [Mod] Automatic update check on startup is no longer available.\n"
                 "    [Fix] Copy/Paste in pattern was partly broken when working with MOD format.\n"
-				"    [Fix] Fixed wrong version in IT files saved with compatibility save.\n"
+				"    [Fix] Fixed wrong version in IT files saved with compatibility export.\n"
 				"\n"
-				"    For more detail, see history.txt.";
+				"    For more detailed list of changes, see history.txt.";
 			
 	CMainFrame::GetMainFrame()->MessageBox(firstOpenMessage, "OpenMPT v." MPT_VERSION_STR, MB_ICONINFORMATION);
 }
@@ -1264,7 +1264,7 @@
 // -> DESC="IT project files (.itp)"
 					"Impulse Tracker Projects (*.itp)|*.itp;*.itpz|"
 // -! NEW_FEATURE#0023
-					"Open MPT Modules (*.mptm)|*.mptm;*.mptmz|"
+					"OpenMPT Modules (*.mptm)|*.mptm;*.mptmz|"
 					"Other Modules (mtm,okt,mdl,669,far,...)|*.mtm;*.669;*.ult;*.wow;*.far;*.mdl;*.okt;*.dmf;*.ptm;*.med;*.ams;*.dbm;*.dsm;*.umx;*.amf;*.psm;*.mt2|"
 					"Wave Files (*.wav)|*.wav|"
 					"Midi Files (*.mid,*.rmi)|*.mid;*.rmi;*.smf|"
@@ -1651,7 +1651,7 @@
 	m_bmp.LoadBitmap(MAKEINTRESOURCE(IDB_MPTRACK));
 	wsprintf(s, "Build Date: %s", gszBuildDate);
 	SetDlgItemText(IDC_EDIT2, s);
-	SetDlgItemText(IDC_EDIT3, CString("Open Modplug Tracker, version ") + MptVersion::str + " (development build)");
+	SetDlgItemText(IDC_EDIT3, CString("OpenMPT, version ") + MptVersion::str + " (development build)");
 
 	m_heContact.SetWindowText(
 "Contact / Discussion:\r\n\

Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp	2009-05-09 23:01:26 UTC (rev 257)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp	2009-05-17 14:54:05 UTC (rev 258)
@@ -1967,7 +1967,7 @@
 	int param = m_pModDoc->MacroToPlugParam(&(m_MidiCfg.szMidiSFXExt[sfx*32]));
 	CVstPlugin *pVstPlugin; 
 	char s[256];
-	message.Format("These are the parameters that can be conrolled by macro SF%X:\n\n",sfx);
+	message.Format("These are the parameters that can be controlled by macro SF%X:\n\n",sfx);
 	
 	for (UINT plug=0; plug<MAX_MIXPLUGINS; plug++)
 	{


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