fix playing songs from search results

2 files changed, 4 insertions, 4 deletions

diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 8e79a152eb0..29ba45919cf 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -274,7 +274,7 @@ Collection={
 	},
 	findArtist:function(name){
 		for(var i=0;i<Collection.artists.length;i++){
-			if(Collection.artists[i].artist_name==name){
+			if(Collection.artists[i].name==name){
 				return Collection.artists[i];
 			}
 		}
@@ -283,7 +283,7 @@ Collection={
 		var artist=Collection.findArtist(artistName);
 		if(artist){
 			for(var i=0;i<artist.albums.length;i++){
-				if(artist.albums[i].album_name==albumName){
+				if(artist.albums[i].name==albumName){
 					return artist.albums[i];
 				}
 			}
@@ -293,7 +293,7 @@ Collection={
 		var album=Collection.findAlbum(artistName,albumName);
 		if(album){
 			for(var i=0;i<album.songs.length;i++){
-				if(album.songs[i].song_name==songName){
+				if(album.songs[i].name==songName){
 					return album.songs[i];
 				}
 			}
diff --git a/apps/media/js/music.js b/apps/media/js/music.js
index cac16ac6ff7..bf082207829 100644
--- a/apps/media/js/music.js
+++ b/apps/media/js/music.js
@@ -23,8 +23,8 @@ $(document).ready(function(){
 			PlayList.render();
 		});
 		row.find('div.name').append(button);
+		button.tipsy({gravity:'n', fade:true, delayIn: 400, live:true});
 	}
-        $('.add').tipsy({gravity:'n', fade:true, delayIn: 400, live:true});
 	Collection.display();
 });