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

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

Revision: 1293
          http://modplug.svn.sourceforge.net/modplug/?rev=1293&view=rev
Author:   saga-games
Date:     2012-06-07 13:58:15 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
[Fix] Oops.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
    trunk/OpenMPT/soundlib/pattern.cpp

Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp	2012-06-07 13:55:37 UTC (rev 1292)
+++ trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp	2012-06-07 13:58:15 UTC (rev 1293)
@@ -581,15 +581,12 @@
 
 		// Check if any pattern data would be removed.
 		bool resize = true;
-		if(newSize < pSndFile->Patterns[m_nPattern].GetNumRows())
+		for(ROWINDEX row = newSize; row < pSndFile->Patterns[m_nPattern].GetNumRows(); row++)
 		{
-			for(ROWINDEX row = newSize; row < pSndFile->Patterns[m_nPattern].GetNumRows(); row++)
+			if(!pSndFile->Patterns[m_nPattern].IsEmptyRow(row))
 			{
-				if(!pSndFile->Patterns[m_nPattern].IsEmptyRow(row))
-				{
-					resize = (Reporting::Confirm("Data at the end of the pattern will be lost.\nDo you want to continue?", "Shrink Pattern") == cnfYes);
-					break;
-				}
+				resize = (Reporting::Confirm("Data at the end of the pattern will be lost.\nDo you want to continue?", "Shrink Pattern") == cnfYes);
+				break;
 			}
 		}
 

Modified: trunk/OpenMPT/soundlib/pattern.cpp
===================================================================
--- trunk/OpenMPT/soundlib/pattern.cpp	2012-06-07 13:55:37 UTC (rev 1292)
+++ trunk/OpenMPT/soundlib/pattern.cpp	2012-06-07 13:58:15 UTC (rev 1293)
@@ -32,7 +32,7 @@
 bool CPattern::IsEmptyRow(ROWINDEX row) const
 //-------------------------------------------
 {
-	if(m_ModCommands == nullptr || IsValidRow(row))
+	if(m_ModCommands == nullptr || !IsValidRow(row))
 	{
 		return true;
 	}

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