Fix playing a playlist containing an invalid media as first item

When a playlist contains an invalid media, QMediaPlayer normally
continues to the next media. If an invalid media was first in the list,
the backend would never go into PlayingState, which would then cause
the media player to never start the next item in the list (thinking
it's stopped).
We now always transition to PlayingState when starting playback of a
playlist, regardless of the backend going into that state or not.

Change-Id: I4227f937e7a619afbd8adbe2fccedfa5d43ad89a
Reviewed-by: Christian Stromme <christian.stromme@qt.io>

1 files changed, 9 insertions, 7 deletions

diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index c1636e8e8..e6e4c7c1a 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -853,17 +853,19 @@ void QMediaPlayer::play()
     }
 
     //if playlist control is available, the service should advance itself
-    if (d->rootMedia.playlist() && d->rootMedia.playlist()->currentIndex() == -1 && !d->rootMedia.playlist()->isEmpty()) {
-
+    if (d->rootMedia.playlist() && !d->rootMedia.playlist()->isEmpty()) {
         // switch to playing state
         if (d->state != QMediaPlayer::PlayingState)
             d->_q_stateChanged(QMediaPlayer::PlayingState);
 
-        if (d->playlist != d->rootMedia.playlist())
-            d->setPlaylist(d->rootMedia.playlist());
-        Q_ASSERT(d->playlist == d->rootMedia.playlist());
-        emit currentMediaChanged(d->rootMedia);
-        d->playlist->setCurrentIndex(0);
+        if (d->rootMedia.playlist()->currentIndex() == -1) {
+            if (d->playlist != d->rootMedia.playlist())
+                d->setPlaylist(d->rootMedia.playlist());
+            Q_ASSERT(d->playlist == d->rootMedia.playlist());
+
+            emit currentMediaChanged(d->rootMedia);
+            d->playlist->setCurrentIndex(0);
+        }
     }
 
     // Reset error conditions