From b8cd7a732cbabc2c6d7e66c08814ca67a0e91479 Mon Sep 17 00:00:00 2001 From: Nemrav <> Date: Mon, 16 Sep 2024 14:55:12 -0300 Subject: music null check --- extension/src/openvic-extension/singletons/SoundSingleton.cpp | 1 - game/src/Game/MusicConductor/MusicConductor.gd | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/extension/src/openvic-extension/singletons/SoundSingleton.cpp b/extension/src/openvic-extension/singletons/SoundSingleton.cpp index a32d9fe..b9a2ee3 100644 --- a/extension/src/openvic-extension/singletons/SoundSingleton.cpp +++ b/extension/src/openvic-extension/singletons/SoundSingleton.cpp @@ -1,7 +1,6 @@ #include "SoundSingleton.hpp" #include -#include #include #include diff --git a/game/src/Game/MusicConductor/MusicConductor.gd b/game/src/Game/MusicConductor/MusicConductor.gd index 7103aff..f7e3b2a 100644 --- a/game/src/Game/MusicConductor/MusicConductor.gd +++ b/game/src/Game/MusicConductor/MusicConductor.gd @@ -96,9 +96,14 @@ func setup_compat_song(file_name) -> void: var song = SongInfo.new() var stream = SoundSingleton.get_song(file_name) + if stream == null: + push_error("Audio Stream for compat song %s was null" % file_name) + return + var metadata = MusicMetadata.new() metadata.set_from_stream(stream) var title = metadata.title + if title == "": #use the file name without the extension if there's no metadata title = file_name.split(".")[0] -- cgit v1.2.3-56-ga3b1