From 164be3056f96f33d3d32aab0324a0a7d50d0f0da Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 19 Sep 2018 19:19:18 -0400
Subject: [PATCH] MP Core s_sound: Mixed D+C fix (buildbots)
---
src/s_sound.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/s_sound.c b/src/s_sound.c
index 3da594fe18..4a9500e719 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1437,6 +1437,8 @@ static void S_ChangeMusicToQueue(void)
void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms)
{
+ char newmusic[7];
+
#if defined (DC) || defined (_WIN32_WCE) || defined (PSP) || defined(GP2X)
S_ClearSfx();
#endif
@@ -1444,7 +1446,6 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
if (S_MusicDisabled())
return;
- char newmusic[7];
strncpy(newmusic, mmusic, 7);
#if defined(HAVE_BLUA) && defined(HAVE_LUA_MUSICPLUS)
if(LUAh_MusicChange(music_name, newmusic, &mflags, &looping, &position, &prefadems, &fadeinms))
--
GitLab