Pausing removes current track for some reason

mopidy_iris/static/index.html

@@ -98,7 +98,7 @@
 
 	// Release details
 	// These are automatically injected to built HTML
-	var build = "1536221360";
+	var build = "1536275446";
 	var version = "3.25.1";
 
 	// Construct the script tag

src/js/components/Fields/ProgressSlider.js

@@ -20,7 +20,7 @@ class ProgressSlider extends React.Component{
 
 	render(){
 		var percent = 0;
-		if (this.props.connected && this.props.time_position && this.props.current_track){
+		if (this.props.connected && this.props.time_position && this.props.current_track && this.props.current_track.duration){
 			percent = this.props.time_position / this.props.current_track.duration;
 			percent = percent * 100;
 			if (percent > 1000){

src/js/services/core/middleware.js

@@ -486,20 +486,19 @@ const CoreMiddleware = (function(){
              * Index actions
              * These modify our asset indexes, which are used globally
              **/
-/*
 
             case 'CURRENT_TRACK_LOADED':
                 store.dispatch(coreActions.trackLoaded(action.track));
+                action.track = helpers.formatTrack(action.track);
                 next(action);
                 break;
+
             case 'QUEUE_LOADED':
                 store.dispatch(coreActions.tracksLoaded(action.tracks));
+                action.tracks = helpers.formatTracks(action.tracks);
                 next(action);
                 break;
-                */
 
-            case 'CURRENT_TRACK_LOADED':
-            case 'QUEUE_LOADED':
             case 'TRACKS_LOADED':
                 var tracks_index = Object.assign({}, core.tracks);
                 var artists_index = core.artists;
@@ -508,19 +507,13 @@ const CoreMiddleware = (function(){
                 var artists_loaded = [];
                 var albums_loaded = [];
 
-                if (action.tracks){
+                action.tracks.forEach(raw_track => {
-                	var tracks = action.tracks;
-                } else if (action.track){
-                	var tracks = [action.track];
-                }
-
-                tracks.forEach(raw_track => {
                     var track = helpers.formatTrack(raw_track);
 
                     if (tracks_index[track.uri] !== undefined){
                         track = Object.assign({}, tracks_index[track.uri], track);
                     }
-
+                    
                     if (raw_track.album){
                         track.album = helpers.formatSimpleObject(raw_track.album);
 
@@ -550,13 +543,6 @@ const CoreMiddleware = (function(){
                     tracks_loaded.push(track);
                 });
 
-                if (action.type == 'CURRENT_TRACK_LOADED'){
-                	action.current_track = tracks_loaded[0];
-                	action.current_track_uri = tracks_loaded[0].uri;
-                } else {
-                	action.tracks = tracks_loaded;
-                }
-
                 if (artists_loaded.length > 0){
                     store.dispatch(coreActions.artistsLoaded(artists_loaded));
                 }

src/js/services/mopidy/middleware.js

@@ -2155,7 +2155,6 @@ const MopidyMiddleware = (function(){
 
                 request(socket, store, 'library.getImages', {uris: action.uris})
                     .then(response => {
-
                         var records = [];
                         for (var uri in response){
                             if (response.hasOwnProperty(uri)){