summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2009-11-09 15:09:58 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2009-11-09 18:35:47 (GMT)
commit7c8676c35df44404aa30824ae7856408c3c5a629 (patch)
tree9a2fc0ce0e628d2be144163e875e703d830448f7 /src
parent869323e1d6e7524050e2240fdc1bedb7b7639444 (diff)
downloadQt-7c8676c35df44404aa30824ae7856408c3c5a629.zip
Qt-7c8676c35df44404aa30824ae7856408c3c5a629.tar.gz
Qt-7c8676c35df44404aa30824ae7856408c3c5a629.tar.bz2
Allowed execution of pause command when backend is in error state
When qmediaplayer receives a stateChanged(ErrorState) signal, it first displays a dialog, and then calls pause() on the media object. This change allows that pause command to be executed on the underlying MMF client API. Reviewed-by: Frans Englich
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/phonon/mmf/abstractmediaplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
index f2efaa0..4d7bc06 100644
--- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
+++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
@@ -109,12 +109,12 @@ void MMF::AbstractMediaPlayer::pause()
case GroundState:
case LoadingState:
case PausedState:
- case ErrorState:
// Do nothing
break;
case StoppedState:
case PlayingState:
+ case ErrorState:
case BufferingState:
doPause();
stopTickTimer();