Merge pull request #1496 from dublok/fix/1462-flac-seek-freeze

audio: Ignore position of _on_position_changed callback (fixes #1462)
mopidy · Jul 25, 2016 · 3ee9124 · 3ee9124
1 parent fb823d1
commit 3ee9124
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py
@@ -230,8 +230,8 @@ def _on_stream_changed(self, uri):
                 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
@@ -734,6 +734,7 @@ def test_seek_race_condition_emits_events(self, listener_mock):
 
         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)