Battle music continues after battle completed

[OnlineCop]

I've noticed that the map's music plays as the player walks around, and the battle music starts as soon as a battle begins.

Once the battle ends, the battle music continues to play instead of resetting to the map music.

[pedro-w]

There was some kind of 'stack' system for music players when we were using DUMB, which didn't translate to the way SDL_mixer works. I suppose we need to re-instate something like that. I think if the map track restarted from the beginning after combat, that wouldn't be a big deal?