From 54b89eefbb700261a670875fcd77a63fa9e0838f Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 7 Sep 2019 11:48:58 +0100
Subject: [PATCH 1/2] * Fix jingle captions dying immediately (caused by an
 S_StopMusic call in P_PlayJingle; resolved by modifying order of operations).

---
 src/p_enemy.c | 2 +-
 src/p_user.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/p_enemy.c b/src/p_enemy.c
index e3f169784..0129000fc 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -4149,9 +4149,9 @@ void A_Invincibility(mobj_t *actor)
 	{
 		if (mariomode)
 			G_GhostAddColor(GHC_INVINCIBLE);
+		P_PlayJingle(player, (mariomode) ? JT_MINV : JT_INV);
 		strlcpy(S_sfx[sfx_None].caption, "Invincibility", 14);
 		S_StartCaption(sfx_None, -1, player->powers[pw_invulnerability]);
-		P_PlayJingle(player, (mariomode) ? JT_MINV : JT_INV);
 	}
 }
 
diff --git a/src/p_user.c b/src/p_user.c
index a69bd5b93..58ba00fc9 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1431,11 +1431,11 @@ void P_PlayLivesJingle(player_t *player)
 		S_StartSound(NULL, sfx_marioa);
 	else
 	{
+		P_PlayJingle(player, JT_1UP);
 		if (player)
 			player->powers[pw_extralife] = extralifetics + 1;
 		strlcpy(S_sfx[sfx_None].caption, "One-up", 7);
 		S_StartCaption(sfx_None, -1, extralifetics+1);
-		P_PlayJingle(player, JT_1UP);
 	}
 }
 

From cf4b5a1b9d34ef72a83a71934ba6998800088053 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 7 Sep 2019 11:49:13 +0100
Subject: [PATCH 2/2] * Comment out the notices that the two types of music are
 disabled (see issue #179; not a perfect fix, but good enough for now).

---
 src/s_sound.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/s_sound.c b/src/s_sound.c
index 1c6cd5ef1..3068db1df 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1783,12 +1783,12 @@ static lumpnum_t S_GetMusicLumpNum(const char *mname)
 		return W_GetNumForName(va("d_%s", mname));
 	else if (S_DigMusicDisabled() && S_DigExists(mname))
 	{
-		CONS_Alert(CONS_NOTICE, "Digital music is disabled!\n");
+		//CONS_Alert(CONS_NOTICE, "Digital music is disabled!\n");
 		return LUMPERROR;
 	}
 	else if (S_MIDIMusicDisabled() && S_MIDIExists(mname))
 	{
-		CONS_Alert(CONS_NOTICE, "MIDI music is disabled!\n");
+		//CONS_Alert(CONS_NOTICE, "MIDI music is disabled!\n");
 		return LUMPERROR;
 	}
 	else