Add index++ to 2D Tutorial's AudioController.Update()

Hyunwook Ha · Hyunwook Ha · commit ba271b9eac31 · 2025-06-20T09:12:04.000+09:00
diff --git a/Tutorials/learn-monogame-2d/src/15-Audio-Controller/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/15-Audio-Controller/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/16-Working-With-SpriteFonts/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/16-Working-With-SpriteFonts/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/17-Scenes/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/17-Scenes/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/18-Texture-Wrapping/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/18-Texture-Wrapping/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/19-User-Interface-Fundamentals/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/19-User-Interface-Fundamentals/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/20-Implementing-UI-With-Gum/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/20-Implementing-UI-With-Gum/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/21-Customizing-Gum-UI/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/21-Customizing-Gum-UI/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/22-Snake-Game-Mechanics/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/22-Snake-Game-Mechanics/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/23-Completing-The-Game/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/23-Completing-The-Game/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/24-Shaders/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/24-Shaders/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/25-Packaging-Game/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/25-Packaging-Game/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/26-Publish-To-Itch/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/26-Publish-To-Itch/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 
diff --git a/Tutorials/learn-monogame-2d/src/27-Conclusion/MonoGameLibrary/Audio/AudioController.cs b/Tutorials/learn-monogame-2d/src/27-Conclusion/MonoGameLibrary/Audio/AudioController.cs
@@ -109,9 +109,9 @@ public void Update()
             if (instance.State == SoundState.Stopped && !instance.IsDisposed)
             {
                 instance.Dispose();
+                _activeSoundEffectInstances.RemoveAt(index);
             }
-
-            _activeSoundEffectInstances.RemoveAt(index);
+            index++;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -109,9 +109,9 @@ public void Update()`
`109`	`109`	`if (instance.State == SoundState.Stopped && !instance.IsDisposed)`
`110`	`110`	`{`
`111`	`111`	`instance.Dispose();`
	`112`	`+ _activeSoundEffectInstances.RemoveAt(index);`
`112`	`113`	`}`
`113`		`-`
`114`		`- _activeSoundEffectInstances.RemoveAt(index);`
	`114`	`+ index++;`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`