--- a/src/3rdparty/phonon/mmf/abstractplayer.cpp	Wed Apr 21 12:15:23 2010 +0300
+++ b/src/3rdparty/phonon/mmf/abstractplayer.cpp	Wed Apr 21 20:15:53 2010 +0300
@@ -48,6 +48,11 @@
         m_tickInterval = player->m_tickInterval;
         m_transitionTime = player->m_transitionTime;
         m_prefinishMark = player->m_prefinishMark;
+
+        // This is to prevent unwanted state transitions occurring as a result
+        // of MediaObject::switchToNextSource() during playlist playback.
+        if (StoppedState == player->m_state)
+            m_state = player->m_state;
     }
 }
 
@@ -141,7 +146,7 @@
     return phononState(m_state);
 }
 
-Phonon::State MMF::AbstractPlayer::phononState(PrivateState state)
+Phonon::State MMF::AbstractPlayer::phononState(PrivateState state) const
 {
     const Phonon::State phononState =
         GroundState == state