Merge pull request openhab#134 from kgoderis/sonos

Fix small bugs in updateCurrentURIFormatted and updateTrackMetaData
peuter · Feb 16, 2015 · 25cc1b3 · 25cc1b3
2 parents 54b135c + ad957f8
commit 25cc1b3
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/...nhab.binding.sonos/src/main/java/org/openhab/binding/sonos/handler/ZonePlayerHandler.java b/...nhab.binding.sonos/src/main/java/org/openhab/binding/sonos/handler/ZonePlayerHandler.java
@@ -600,24 +600,26 @@ protected void updateTrackMetaData() {
 
 		if (currentTrack != null) {
 
-			String artist = "";
+			String artist = null;
 			if (currentTrack.getAlbumArtist().equals("")) {
 				artist = currentTrack.getCreator();
 			} else {
 				artist = currentTrack.getAlbumArtist();
 			}
 
 			String album = currentTrack.getAlbum();
-			String title = "";
+			String title = null;
 			if(!currentTrack.getTitle().contains("x-sonosapi-stream")) {
 				title = currentTrack.getTitle();
 			}
 
 			// update individual variables
 			this.onValueReceived("CurrentArtist", (artist != null) ? artist
 					: "", "AVTransport");
-			this.onValueReceived("CurrentTitle", (title != null) ? title : "",
-					"AVTransport");
+			if(title!=null) {
+				this.onValueReceived("CurrentTitle", (title != null) ? title : "",
+						"AVTransport");
+			}
 			this.onValueReceived("CurrentAlbum", (album != null) ? album : "",
 					"AVTransport");
 
@@ -635,7 +637,7 @@ protected void updateCurrentURIFormatted() {
 		String coordinator = getCoordinator();
 		ZonePlayerHandler coordinatorHandler = getHandlerByName(coordinator);
 
-		if (coordinatorHandler != null) {
+		if (coordinatorHandler != null && coordinatorHandler != this) {
 			if(getCurrentURI().contains("x-rincon")) {
 				coordinatorHandler.updateMediaInfo();
 			}