diff --git a/mopidy/core/actor.py b/mopidy/core/actor.py index 1c635799..03ad2712 100644 --- a/mopidy/core/actor.py +++ b/mopidy/core/actor.py @@ -46,9 +46,10 @@ class Core(pykka.ThreadingActor, AudioListener, BackendListener): self.tracklist = TracklistController(core=self) - # Hook up blocking on end of track handler to audio sub-system. - audio.set_on_end_of_track( - lambda: self.actor_ref.proxy().playback.on_end_of_track().get()) + if audio: + # Hook up blocking on end of track handler to audio sub-system. + audio.set_on_end_of_track( + lambda: self.actor_ref.proxy().playback.on_end_of_track().get()) def get_uri_schemes(self): futures = [b.uri_schemes for b in self.backends] diff --git a/tests/backends/base/tracklist.py b/tests/backends/base/tracklist.py index 71f44018..39536edc 100644 --- a/tests/backends/base/tracklist.py +++ b/tests/backends/base/tracklist.py @@ -18,7 +18,7 @@ class TracklistControllerTest(object): def setUp(self): self.audio = mock.Mock(spec=audio.Audio) self.backend = self.backend_class.start(audio=self.audio).proxy() - self.core = core.Core(audio=audio, backends=[self.backend]) + self.core = core.Core(audio=self.audio, backends=[self.backend]) self.controller = self.core.tracklist self.playback = self.core.playback