From d39b7011c5b12e5b7abe3e493971e003469a1f3d Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Fri, 24 Aug 2018 18:01:57 -0400
Subject: [PATCH] Volume fixes

# Conflicts:
#	src/sdl/mixer_sound.c
---
 src/s_sound.c         | 6 ++++--
 src/sdl/mixer_sound.c | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/s_sound.c b/src/s_sound.c
index 78e3b345e..e5285c321 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1587,11 +1587,13 @@ void S_SetMusicVolume(INT32 digvolume, INT32 seqvolume)
 	switch(I_SongType())
 	{
 		case MU_MID:
-		case MU_MOD:
-		case MU_GME:
+		//case MU_MOD:
+		//case MU_GME:
 			I_SetMusicVolume(seqvolume&31);
+			break;
 		default:
 			I_SetMusicVolume(digvolume&31);
+			break;
 	}
 }
 
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 2e5735ef9..c5eb985fa 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -769,7 +769,7 @@ void I_ResumeSong(void)
 
 void I_SetMusicVolume(UINT8 volume)
 {
-	if (!music)
+	if (!I_SongPlaying())
 		return;
 
 #ifdef _WIN32