diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2014-03-27 10:56:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-27 16:43:39 +0100 |
| commit | 5869d484415168692f6ca9513beacf6f69c92c0a (patch) | |
| tree | 2bbaa69b54c37ac55a6b54304d0952c2b72786a2 | |
| parent | 9c3e685352f7c6fc8cd763644090e993fdf9a0d4 (diff) | |
| download | qtmultimedia-5869d484415168692f6ca9513beacf6f69c92c0a.tar.gz | |
Android: Fix reload check in onStateChanged().
The condition was missing the Uninitialized flag.
Change-Id: I555f4eae6cc33bee0a4925e626dd56041e4b0471
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| -rw-r--r-- | src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp index 4b836ddf4..f67808342 100644 --- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp +++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp @@ -510,8 +510,10 @@ void QAndroidMediaPlayerControl::onVideoSizeChanged(qint32 width, qint32 height) void QAndroidMediaPlayerControl::onStateChanged(qint32 state) { // If reloading, don't report state changes unless the new state is Prepared or Error. - if ((mState & JMediaPlayer::Stopped) && !(state & (JMediaPlayer::Prepared | JMediaPlayer::Error))) + if ((mState & JMediaPlayer::Stopped) + && (state & (JMediaPlayer::Prepared | JMediaPlayer::Error | JMediaPlayer::Uninitialized)) == 0) { return; + } mState = state; switch (mState) { |