From 61491fb295647462611f49752942834b3afb0273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20G=C3=B6ffringmann?=
 <lavosspawn@users.sourceforge.net>
Date: Tue, 17 Jun 2003 12:26:25 +0000
Subject: [PATCH] don't restart music if the same track is already playing

svn-id: r8528
---
 sky/music/musicbase.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp
index cc1670f9963..d03edbb4f25 100644
--- a/sky/music/musicbase.cpp
+++ b/sky/music/musicbase.cpp
@@ -148,7 +148,8 @@ void SkyMusicBase::pollMusic(void)
 	uint8 newTempo;
 	if (_onNextPoll.doReInit) startDriver();
 	if (_onNextPoll.doStopMusic) stopMusic();
-	if (_onNextPoll.musicToProcess) loadNewMusic();
+	if (_onNextPoll.musicToProcess == _currentMusic) _onNextPoll.musicToProcess = 0;
+	if (_onNextPoll.musicToProcess)	loadNewMusic();
 
 	_aktTime += _tempo;