Fix loading modules which have 28 channels

Seems there was an off-by-one error in the code for quite some time.
HertzDevil · Jan 16, 2017 · 5ad4c3c · 5ad4c3c · langel · Jan 17, 2017
1 parent cc34d69
commit 5ad4c3c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/FamiTrackerDoc.cpp b/Source/FamiTrackerDoc.cpp
@@ -1638,7 +1638,7 @@ void CFamiTrackerDoc::ReadBlock_Parameters(CDocumentFile *pDocFile, const int Ve
 		m_iExpansionChip = pDocFile->GetBlockChar();
 
 	m_iChannelsAvailable = AssertRange(pDocFile->GetBlockInt(), 1, MAX_CHANNELS, "Channel count");		// // //
-	AssertRange<MODULE_ERROR_OFFICIAL>(static_cast<int>(m_iChannelsAvailable), 1, MAX_CHANNELS - 1, "Channel count");
+	AssertRange<MODULE_ERROR_OFFICIAL>(static_cast<int>(m_iChannelsAvailable), 1, MAX_CHANNELS, "Channel count");		// // //
 
 	m_iMachine = static_cast<machine_t>(pDocFile->GetBlockInt());
 	AssertFileData(m_iMachine == NTSC || m_iMachine == PAL, "Unknown machine");

diff --git a/Source/FamiTrackerTypes.h b/Source/FamiTrackerTypes.h
@@ -84,7 +84,7 @@ const int ECHO_BUFFER_LENGTH = 3;
 
 // Number of available channels (max) TODO: should not be used anymore!
 // instead, check the channelsavailable variable and allocate dynamically
-const int MAX_CHANNELS	 = 5 + 3 + 2 + 6 + 1 + 8 + 3;		
+const int MAX_CHANNELS	 = 5 + 3 + 2 + 8 + 1 + 6 + 3;		// // //
 
 const int CHANNELS_DEFAULT = 5;
 const int CHANNELS_VRC6	   = 3;