SVN commit 1282120 by sandsmark:

Scrobble only when we are actually about to finish the current song.

We can't rely on the aboutToFinish() signal from Phonon (it is sometimes
emitted several times).



 M  +1 -1      playermanager.cpp  


--- trunk/KDE/kdemultimedia/juk/playermanager.cpp #1282119:1282120
@@ -222,7 +222,6 @@
 
     // The "currently playing" media object.
     Phonon::MediaObject *mediaObject = m_media[m_curOutputPath];
-    connect(mediaObject, SIGNAL(aboutToFinish()), m_scrobbler, SLOT(scrobble()));
     
     if(file.isNull()) {
         if(paused())
@@ -417,6 +416,7 @@
 
 void PlayerManager::slotNeedNextUrl()
 {
+    m_scrobbler->scrobble();
     if(m_file.isNull() || !m_crossfadeTracks)
         return;