aboutsummaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-10-09 23:54:55 +0200
committermetamuffin <metamuffin@disroot.org>2025-10-09 23:54:57 +0200
commit878afdea8f6b5b29b4d23f6a9ba8f5e539f24d0a (patch)
tree5db633e23b69239063b58faf7626c0279eea7c5e /client
parent5879059a6757d471218eac3508ba3d28fcce8604 (diff)
downloadhurrycurry-878afdea8f6b5b29b4d23f6a9ba8f5e539f24d0a.tar
hurrycurry-878afdea8f6b5b29b4d23f6a9ba8f5e539f24d0a.tar.bz2
hurrycurry-878afdea8f6b5b29b4d23f6a9ba8f5e539f24d0a.tar.zst
Fix crash on stop music
Diffstat (limited to 'client')
-rw-r--r--client/audio/sound.gd22
1 files changed, 13 insertions, 9 deletions
diff --git a/client/audio/sound.gd b/client/audio/sound.gd
index d2696aad..d9c20600 100644
--- a/client/audio/sound.gd
+++ b/client/audio/sound.gd
@@ -34,15 +34,19 @@ const EFFECT_FADE_SPEED = 0.5
func set_music(filename, volume = 0., dampen = false):
if current_music_filename != filename:
- var player = AudioStreamPlayer.new()
- player.stream = load("res://audio/music/%s.ogg" % filename)
- player.volume_db = VOLUME_MIN + 1.
- player.autoplay = true
- player.name = filename
- player.bus = "Music"
- current_music_player = player
- current_music_filename = filename
- $Music.add_child(player)
+ if filename == null:
+ current_music_filename = null
+ current_music_player = null
+ else:
+ var player = AudioStreamPlayer.new()
+ player.stream = load("res://audio/music/%s.ogg" % filename)
+ player.volume_db = VOLUME_MIN + 1.
+ player.autoplay = true
+ player.name = filename
+ player.bus = "Music"
+ current_music_player = player
+ current_music_filename = filename
+ $Music.add_child(player)
volume_target = volume
dampen_target = 1. if dampen else 0.