diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:30:14 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:30:14 +0100 |
| commit | d2545bd40f0a4150f616f52b9138a34c60ed2d3c (patch) | |
| tree | e9e76ae976a20a22ff400a1cdd0650bf90da45b9 /src/plugins/qnx | |
| parent | b0481d4b47f96b157989203bf57ec7e8ca266513 (diff) | |
| parent | da89319f3859b30cf4cf03a53b50677092138921 (diff) | |
| download | qtmultimedia-d2545bd40f0a4150f616f52b9138a34c60ed2d3c.tar.gz qtmultimedia-d2545bd40f0a4150f616f52b9138a34c60ed2d3c.tar.bz2 qtmultimedia-d2545bd40f0a4150f616f52b9138a34c60ed2d3c.zip | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I7dc36a224702721b67ffa2cf7f9ce2a6b047f88e
Diffstat (limited to 'src/plugins/qnx')
| -rw-r--r-- | src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp index 2a376198..e8000179 100644 --- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp +++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp @@ -530,7 +530,7 @@ void MmRendererMediaPlayerControl::play() } setPositionInternal(m_position); - setVolumeInternal(m_volume); + setVolumeInternal(m_muted ? 0 : m_volume); setPlaybackRateInternal(m_rate); if (mmr_play(m_context) != 0) { |