From 200e4d2536484b1063a82aa6a4505f7f33cc0960 Mon Sep 17 00:00:00 2001 From: Trygve Aaberge Date: Tue, 18 Dec 2012 19:00:46 +0100 Subject: [PATCH] audio: Don't try to rescale volume_set if it's None --- mopidy/audio/actor.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index 0df8fb2b..3910ee80 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -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(