From 663ba19923b4ecc1045f75e035ff117ce53cf55a Mon Sep 17 00:00:00 2001 From: NepDisk Date: Thu, 13 Mar 2025 13:28:40 -0400 Subject: [PATCH] Fix more Music Test Crashes --- src/m_menu.c | 2 +- src/s_sound.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index bea8bfb34..60be3d418 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -6937,7 +6937,7 @@ static void M_DrawMusicTest(void) if (curplaying) { - if (!curplaying->usage && !curplaying->usage[0]) + if (!curplaying->usage || !curplaying->usage[0]) V_DrawString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_ALLOWLOWERCASE, va("%.6s", &curplaying->name[0][0])); else { V_DrawSmallString(vid.dupx, vid.height - 5*vid.dupy, V_NOSCALESTART|V_ALLOWLOWERCASE, va("%.6s - %.255s\n", &curplaying->name[0][0], curplaying->usage)); diff --git a/src/s_sound.c b/src/s_sound.c index 136a054b3..3a6b606da 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1633,11 +1633,15 @@ static void S_LoadMusicDefLump(lumpnum_t lumpnum) if (df->legacy && df->source) { df->source = replacechar(df->source, '_', ' '); - df->usage = replacechar(df->usage, '_', ' '); df->title = Z_StrDup(df->source); memset(df->source, 0, strlen(df->source)); df->source = NULL; } + + if (df->legacy && df->usage) + { + df->usage = replacechar(df->usage, '_', ' '); + } } free(musdeftext);