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

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

Revision: 1031
          http://modplug.svn.sourceforge.net/modplug/?rev=1031&view=rev
Author:   saga-games
Date:     2011-09-10 19:55:00 +0000 (Sat, 10 Sep 2011)
Log Message:
-----------
[Fix] Last sample and instrument name were not sanitized properly before writing them to file.
[Mod] Changed "file not found" message box to error type
[Mod] Pattern Editor: Row Spacing is now 0 by default.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.cpp

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2011-09-09 13:22:13 UTC (rev 1030)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2011-09-10 19:55:00 UTC (rev 1031)
@@ -3973,14 +3973,14 @@
 	StringFixer::FixNullString(m_SndFile.m_szNames[0]);
 
 	// Sample names + filenames
-	for(SAMPLEINDEX nSmp = 1; nSmp < m_SndFile.GetNumSamples(); nSmp++)
+	for(SAMPLEINDEX nSmp = 1; nSmp <= m_SndFile.GetNumSamples(); nSmp++)
 	{
 		StringFixer::FixNullString(m_SndFile.m_szNames[nSmp]);
 		StringFixer::FixNullString(m_SndFile.GetSample(nSmp).filename);
 	}
 
 	// Instrument names
-	for(INSTRUMENTINDEX nIns = 1; nIns < m_SndFile.GetNumInstruments(); nIns++)
+	for(INSTRUMENTINDEX nIns = 1; nIns <= m_SndFile.GetNumInstruments(); nIns++)
 	{
 		if(m_SndFile.Instruments[nIns] != nullptr)
 		{		

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2011-09-09 13:22:13 UTC (rev 1030)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2011-09-10 19:55:00 UTC (rev 1031)
@@ -97,7 +97,7 @@
 			{
 				CString str;
 				str.Format(GetStrI18N(_TEXT("Unable to open \"%s\": file does not exist.")), path);
-				Reporting::Notification(str);
+				Reporting::Error(str);
 			}
 			else //Case: Valid path but opening fails.
 			{		

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2011-09-09 13:22:13 UTC (rev 1030)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2011-09-10 19:55:00 UTC (rev 1031)
@@ -30,7 +30,7 @@
 TrackerSettings::TrackerSettings()
 //--------------------------------
 {
-	gnPatternSpacing = 1;
+	gnPatternSpacing = 0;
 	gbPatternRecord = TRUE;
 	gbPatternVUMeters = FALSE;
 	gbPatternPluginNames = TRUE;

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