X-Git-Url: https://git.wh0rd.org/?p=chrome-ext%2Fmusic-player-client.git;a=blobdiff_plain;f=main.js;h=266bb1e60f6b242ff3108ae858d3d9322281f9b2;hp=a5bf7841f730014dac609bb68e3145552b829e82;hb=59f1734f1a863c8082c2a65b5f479cb6aea9651c;hpb=3a55dda47c0031b6706d1b1c45092c7766047da4

diff --git a/main.js b/main.js
index a5bf784..266bb1e 100644
--- a/main.js
+++ b/main.js
@@ -157,12 +157,15 @@ function show_page(page) {
 	if (typeof(page) != 'string')
 		page = this.id.split('.')[1];
 
+	// We might not be connected in which case 'mpc' will be undefined.
 	switch (page) {
 	case 'playlist':
-		mpc.playlistinfo();
+		if (mpc)
+			mpc.playlistinfo();
 		// Fallthrough.
 	case 'metadata':
-		mpc.currentsong();
+		if (mpc)
+			mpc.currentsong();
 		break;
 	}
 
@@ -310,13 +313,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 +332,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);