andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

audio: Workaround crash caused by race

Browse Source 
Fixes #1430. See #1222 for explanation and proper fix.
This commit is contained in:
Stein Magnus Jodal 2016-02-10 23:02:14 +01:00
parent be568b769f
commit 68add6cda9
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changelog.rst
View File

@ -165,6 +165,10 @@ Audio
should prevent seeking in Mopidy-Spotify from glitching. should prevent seeking in Mopidy-Spotify from glitching.
(Fixes: :issue:`1404`) (Fixes: :issue:`1404`)
- Workaround crash caused by a race that does not seem to affect functionality.
This should be fixed properly together with :issue:`1222`. (Fixes:
:issue:`1430`, PR: :issue:`1438`)
Gapless Gapless
------- -------

6
mopidy/audio/actor.py
View File

@ -257,7 +257,11 @@ class _Handler(object):
new_state = _GST_STATE_MAPPING[new_state] new_state = _GST_STATE_MAPPING[new_state]
old_state, self._audio.state = self._audio.state, new_state old_state, self._audio.state = self._audio.state, new_state
target_state = _GST_STATE_MAPPING[self._audio._target_state] target_state = _GST_STATE_MAPPING.get(self._audio._target_state)
if target_state is None:
# XXX: Workaround for #1430, to be fixed properly by #1222.
logger.debug('Race condition happened. See #1222 and #1430.')
return
if target_state == new_state: if target_state == new_state:
target_state = None target_state = None