Fix MIDI dialog crash.

BleuBleu · Nov 25, 2021 · 8ae21a1 · 8ae21a1
1 parent 5397781
commit 8ae21a1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/FamiStudio/Source/UI/Common/MidiImportDialog.cs b/FamiStudio/Source/UI/Common/MidiImportDialog.cs
@@ -65,7 +65,7 @@ private void Properties_PropertyChanged(PropertyPage props, int propIdx, int row
                 var newChannelCount = Channel.GetChannelCountForExpansionMask(expansionMask, 8);
                 var oldChannelCount = channelSources.Length;
 
-                var maxChannelIndex = 3;
+                var maxChannelIndex = 2;
                 for (int i = 0; i < oldChannelCount; i++)
                 {
                     if (channelSources[i].type == MidiSourceType.Channel && channelSources[i].index != 9)
@@ -76,7 +76,9 @@ private void Properties_PropertyChanged(PropertyPage props, int propIdx, int row
 
                 for (int i = oldChannelCount; i < newChannelCount; i++)
                 {
-                    channelSources[i] = new MidiFileReader.MidiSource() { index = maxChannelIndex++ };
+                    maxChannelIndex = Math.Min(maxChannelIndex + 1, 15);
+                    if (maxChannelIndex == 9) maxChannelIndex++;
+                    channelSources[i] = new MidiFileReader.MidiSource() { index = maxChannelIndex };
                 }
 
                 UpdateListView();