Merge branch 'master' into features/ttn

This commit is contained in:
Loudrob 2015-07-17 07:53:22 -04:00
commit e25c163d48

View file

@ -170,8 +170,8 @@ class DistributedPartyJukeboxActivityBase(DistributedPartyActivity):
if self.music:
if self.__checkPartyValidity() and hasattr(base.cr.playGame.getPlace().loader, 'music') and base.cr.playGame.getPlace().loader.music:
base.cr.playGame.getPlace().loader.music.stop()
self.music.setTime(0.0)
self.music.setLoopCount(getMusicRepeatTimes(length))
self.music.setTime(getMusicRepeatTimes(length))
self.music.setLoopCount(0)
self.music.play()
self.currentSongData = (phase, filename)