diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:27:51 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:30:08 +0100 |
commit | d3a2d9c96994c56d67467c131b8f080510d1a8fd (patch) | |
tree | 088c55da965b1fb6bb327b2821afc4755eab8117 /src/plugins/android/src/mediaplayer | |
parent | 256ff7bb1551f6c62c4ac861472ea29f45dbab3a (diff) | |
parent | 75b4283fb05d07fb8654e031f266e9918f1ae647 (diff) | |
download | qtmultimedia-d3a2d9c96994c56d67467c131b8f080510d1a8fd.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
Diffstat (limited to 'src/plugins/android/src/mediaplayer')
-rw-r--r-- | src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp index 68d2fc66b..1c6497eb0 100644 --- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp +++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp @@ -59,11 +59,11 @@ public: if (--mControl->mActiveStateChangeNotifiers) return; - if (mPreviousState != mControl->state()) - Q_EMIT mControl->stateChanged(mControl->state()); - if (mPreviousMediaStatus != mControl->mediaStatus()) Q_EMIT mControl->mediaStatusChanged(mControl->mediaStatus()); + + if (mPreviousState != mControl->state()) + Q_EMIT mControl->stateChanged(mControl->state()); } private: |