diff --git a/src/js/helpers.js b/src/js/helpers.js index a43c4b0b..e196057e 100755 --- a/src/js/helpers.js +++ b/src/js/helpers.js @@ -93,11 +93,15 @@ export let getCurrentPusherConnection = function( connections, connectionid ){ * @param track object * @return string **/ -export let getTrackIcon = function( track = false ){ - if( !track ) return false - if( !track.album ) return false - if( !track.album.images ) return false - return sizedImages( track.album.images ).small +export let getTrackIcon = function(current_track = false, ui = false){ + if (!ui) return false + if (!current_track) return false + if (typeof(current_track.uri) == 'undefined') return false + if (typeof(ui.tracks[current_track.uri]) === 'undefined') return false + var track = ui.tracks[current_track.uri] + if (!track.album) return false + if (!track.album.images) return false + return sizedImages(track.album.images).small } diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js index c3b68dc0..5faa47ca 100755 --- a/src/js/services/mopidy/middleware.js +++ b/src/js/services/mopidy/middleware.js @@ -237,7 +237,7 @@ const MopidyMiddleware = (function(){ type: 'browser_notification', title: 'Track skipped', body: store.getState().pusher.username +' skipped this track', - icon: (store.getState().ui.current_track ? helpers.getTrackIcon( store.getState().ui.current_track ) : false) + icon: (store.getState().ui.current_track ? helpers.getTrackIcon(store.getState().ui.current_track, store.getState().ui) : false) } store.dispatch( pusherActions.deliverBroadcast(data) ) break @@ -247,7 +247,7 @@ const MopidyMiddleware = (function(){ type: 'browser_notification', title: 'Playback stopped', body: store.getState().pusher.username +' stopped playback', - icon: (store.getState().ui.current_track ? helpers.getTrackIcon( store.getState().ui.current_track ) : false) + icon: (store.getState().ui.current_track ? helpers.getTrackIcon(store.getState().ui.current_track, store.getState().ui) : false) } store.dispatch( pusherActions.deliverBroadcast(data) ) break