From 3ee91240a0c4bb4403ef1c636a12cd96300b40d7 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Mon, 13 Jun 2016 22:44:03 +0200 Subject: [PATCH] Merge pull request #1496 from dublok/fix/1462-flac-seek-freeze audio: Ignore position of _on_position_changed callback (fixes #1462) --- mopidy/core/playback.py | 4 ++-- tests/core/test_playback.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py index ab96171e..da505b22 100644 --- a/mopidy/core/playback.py +++ b/mopidy/core/playback.py @@ -230,8 +230,8 @@ class PlaybackController(object): self._seek(self._pending_position) def _on_position_changed(self, position): - if self._pending_position == position: - self._trigger_seeked(position) + if self._pending_position is not None: + self._trigger_seeked(self._pending_position) self._pending_position = None def _on_about_to_finish_callback(self): diff --git a/tests/core/test_playback.py b/tests/core/test_playback.py index 3572800c..34c9d367 100644 --- a/tests/core/test_playback.py +++ b/tests/core/test_playback.py @@ -734,6 +734,7 @@ class EventEmissionTest(BaseTest): self.core.playback.play(tl_tracks[0]) self.trigger_about_to_finish(replay_until='stream_changed') + self.replay_events() listener_mock.reset_mock() self.core.playback.seek(1000)