audio: Don't try to rescale volume_set if it's None

This commit is contained in:
Trygve Aaberge 2012-12-18 19:00:46 +01:00
parent fcda4696bc
commit 200e4d2536

View File

@ -393,10 +393,8 @@ class Audio(pykka.ThreadingActor):
mixer_scale = (
self._mixer_track.min_volume, self._mixer_track.max_volume)
volume_set_scaled = self._rescale(
self._volume_set, old=internal_scale, new=mixer_scale)
if self._volume_set is not None and volume_set_scaled == avg_volume:
if self._volume_set is not None and self._rescale(self._volume_set,
old=internal_scale, new=mixer_scale) == avg_volume:
return self._volume_set
else:
return self._rescale(