diff --git a/src/actions.cpp b/src/actions.cpp
index 5b18c304ce2..5a6325ea594 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -249,7 +249,7 @@ battle_context::battle_context(const gamemap& map, const std::vector<team>& team
 	if (!attacker_stats_) {
 		const attack_type *def = NULL;
 		if (defender_weapon >= 0) {
-			wassert(defender_weapon < defender.attacks().size());
+			wassert(defender_weapon < (int)defender.attacks().size());
 			def = &defender.attacks()[defender_weapon];
 		}
 		wassert(!defender_stats_ && !attacker_combatant_ && !defender_combatant_);
diff --git a/src/events.cpp b/src/events.cpp
index 0dc2eb6dafd..92d5aa66e48 100644
--- a/src/events.cpp
+++ b/src/events.cpp
@@ -343,7 +343,8 @@ void pump()
 		resize_dimensions.second = 0;
 	}
 
-	sound::think_about_music();
+	if (preferences::music_on())
+		sound::think_about_music();
 }
 
 void raise_process_event()