From 67f98fe673ddf800a3e22b8b86894096c8922983 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Mon, 10 Jul 2017 08:29:26 +1200
Subject: [PATCH] Detecting when to load playlist from index better, fixes #145

---
 src/js/views/Playlist.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/js/views/Playlist.js b/src/js/views/Playlist.js
index 411ce934..0901020d 100755
--- a/src/js/views/Playlist.js
+++ b/src/js/views/Playlist.js
@@ -50,17 +50,24 @@ class Playlist extends React.Component{
 		this.props.uiActions.showContextMenu(data)
 	}
 
-	loadPlaylist( props = this.props ){
-		switch( helpers.uriSource( props.params.uri ) ){
+	loadPlaylist(props = this.props){
 
-			case 'spotify':
-				this.props.spotifyActions.getPlaylist( props.params.uri );
-				break
+		if (props.playlist && props.playlist.tracks && (props.playlist.tracks_total == 0 || props.playlist.tracks.length > 0)){
+			console.info('Loading playlist from index')
 
-			default:
-				if( props.mopidy_connected ) this.props.mopidyActions.getPlaylist( props.params.uri );
-				break
+		} else {
+			switch (helpers.uriSource( props.params.uri)){
 
+				case 'spotify':
+					this.props.spotifyActions.getPlaylist( props.params.uri )
+					break
+
+				default:
+					if (props.mopidy_connected){
+						this.props.mopidyActions.getPlaylist( props.params.uri )
+					}
+					break
+			}
 		}
 	}