From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 10 Sep 2013 20:00:05 +0000 (-0400)
Subject: playlist: fix handling of undefined currentsong
X-Git-Tag: v3.2~6
X-Git-Url: https://git.wh0rd.org/?p=chrome-ext%2Fmusic-player-client.git;a=commitdiff_plain;h=650b9e7b55fa66426318c67b20f6c0cf82faac27;ds=sidebyside

playlist: fix handling of undefined currentsong

If we don't yet have currentsong info, don't try to parse it.
---

diff --git a/main.js b/main.js
index a5bf784..1466bde 100644
--- a/main.js
+++ b/main.js
@@ -310,13 +310,16 @@ function update_ui(state, cmd) {
 	}
 
 	/* Update the metadata tab only when things have changed. */
-	if ('Currentsong' in state && ui_mpc_metadata_file.lastUpdate != state.Currentsong.lastUpdate) {
-		var currentsong = state.Currentsong;
-		ui_mpc_metadata_album.innerText = currentsong.Album;
-		ui_mpc_metadata_artist.innerText = currentsong.Artist;
-		ui_mpc_metadata_title.innerText = currentsong.Title;
-		ui_mpc_metadata_date.innerText = currentsong.Date;
-		ui_mpc_metadata_file.innerText = currentsong.file;
+	var currentsong;
+	if ('Currentsong' in state) {
+		currentsong = state.Currentsong;
+		if (ui_mpc_metadata_file.lastUpdate != state.Currentsong.lastUpdate) {
+			ui_mpc_metadata_album.innerText = currentsong.Album;
+			ui_mpc_metadata_artist.innerText = currentsong.Artist;
+			ui_mpc_metadata_title.innerText = currentsong.Title;
+			ui_mpc_metadata_date.innerText = currentsong.Date;
+			ui_mpc_metadata_file.innerText = currentsong.file;
+		}
 	}
 
 	/* Update the playlist tab only when things have changed. */
@@ -326,7 +329,7 @@ function update_ui(state, cmd) {
 		ui_mpc_playlist.innerHTML = '';
 		playlist.forEach(function(song) {
 			var cell, row = ui_mpc_playlist.insertRow(-1);
-			if (song.Pos == currentsong.Pos)
+			if (currentsong && song.Pos == currentsong.Pos)
 				row.style.fontWeight = 'bold';
 
 			cell = row.insertCell(-1);