X-Git-Url: http://git.maemo.org/git/?p=someplayer;a=blobdiff_plain;f=src%2Ftagresolver.cpp;h=841de0cd1bbc0f11655c08c107cd5d63873bbce2;hp=ef579cdfdd5bc2d67950260c658d1835cf1c19b3;hb=bee1ca99846d2d3f2462e6feb24a13f7b95879f1;hpb=c92d96e01d110d72cee8e8d307667507bf5d6fff

diff --git a/src/tagresolver.cpp b/src/tagresolver.cpp
index ef579cd..841de0c 100644
--- a/src/tagresolver.cpp
+++ b/src/tagresolver.cpp
@@ -27,11 +27,18 @@ void TagResolver::metaStateChanged(Phonon::State newState, Phonon::State /*oldSt
 		QMap<QString, QString> meta = _metaObject->metaData();
 		TrackMetadata metadata(meta.value("TITLE"), meta.value("ARTIST"), meta.value("ALBUM"), time/1000);
 		Track track(0, metadata, source.fileName());
-		emit decoded(track);
 		int index = _sources.indexOf(source)+1;
+		emit decoded(track);
 		if (index != _sources.size()) {
 			Phonon::MediaSource newSource = _sources.at(index);
+			_metaObject->clear();
 			_metaObject->setCurrentSource(newSource);
+		} else {
+			emit done();
 		}
+	} else if (newState == Phonon::ErrorState) {
+		Phonon::MediaSource s = _metaObject->currentSource();
+		_metaObject->clear();
+		_metaObject->setCurrentSource(s);
 	}
 }