move time from tag info to song info.

also, if we can't get the time, then don't add the song to the db!

git-svn-id: https://svn.musicpd.org/mpd/trunk@236 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 2 insertions, 2 deletions

diff --git a/src/directory.c b/src/directory.c
index 64384a1a4..457a5d585 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -327,10 +327,10 @@ int addToDirectory(Directory * directory, char * shortname, char * name) {
 		return addSubDirectoryToDirectory(directory,shortname,name);
 	}
 	else if(isMusic(name)) {
-		LOG("adding %s\n",name);
 		Song * song;
 		song = addSongToList(directory->songs,shortname,name);
 		if(!song) return -1;
+		LOG("added %s\n",name);
 		addSongToTables(song);
 		return 0;
 	}
@@ -807,7 +807,7 @@ int directoryPrintSongInfo(FILE * fp, Song * song, void * data) {
 int sumSongTime(FILE * fp, Song * song, void * data) {
 	unsigned long * time = (unsigned long *)data;
 
-	if(song->tag && song->tag->time>=0) *time+=song->tag->time;
+	if(song->time>=0) *time+=song->time;
 
 	return 0;
 }