I don't understand how the combat music can stop, yet the game thinks you're still in combat. Maybe they should simply tie the combat status to the music. At least they should make combat end when the music goes to normal. Combat music can actually start when you only see combat, but you aren't involved yet or you cannot be involved due to keep walls or successfully cloaking. Thus combat shouldn't start when combat music starts, but it could probably safely end when the music stops.