From 8020624366a48b1563945722744cca20702e078b Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 28 Mar 2024 21:40:16 -0400
Subject: [PATCH 1/3] Fix a crash I found.
---
source/funkin/audio/VoicesGroup.hx | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/source/funkin/audio/VoicesGroup.hx b/source/funkin/audio/VoicesGroup.hx
index 91054cfb0..5037ee1d0 100644
--- a/source/funkin/audio/VoicesGroup.hx
+++ b/source/funkin/audio/VoicesGroup.hx
@@ -159,10 +159,18 @@ class VoicesGroup extends SoundGroup
public override function destroy():Void
{
- playerVoices.destroy();
- playerVoices = null;
- opponentVoices.destroy();
- opponentVoices = null;
+ if (playerVoices != null)
+ {
+ playerVoices.destroy();
+ playerVoices = null;
+ }
+
+ if (opponentVoices != null)
+ {
+ opponentVoices.destroy();
+ opponentVoices = null;
+ }
+
super.destroy();
}
}
From aa7ff6fbc45a0820dc2da581ea5b84e44d5df7c7 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Thu, 28 Mar 2024 21:40:47 -0400
Subject: [PATCH 2/3] Update assets submodule
---
assets | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets b/assets
index 485243fdd..15c3f16c7 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 485243fdd44acbc4db6a97ec7bf10a8b18350be9
+Subproject commit 15c3f16c7ec162b7c8d86421b624d74501b9616f
From 3637e3594ba85e1e0344ab33053b8960edd86b3b Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Sat, 30 Mar 2024 03:24:30 -0400
Subject: [PATCH 3/3] assets submod
---
assets | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets b/assets
index 15c3f16c7..200658724 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 15c3f16c7ec162b7c8d86421b624d74501b9616f
+Subproject commit 200658724592b298f49b13016f2c706c54ad538f