diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-27 22:44:53 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-27 22:44:53 +0200 |
| commit | cb1871d06113dbbb8b8ac6fd5541baf09fc33004 (patch) | |
| tree | ad53596a3fd3eb54a9a12cfb45fb367bcd2ae810 /src/multimedia/audio | |
| parent | 48a6a8a04394c63c77259fa0c2ced34dfa0ce9fe (diff) | |
| parent | a2f078f1088827ec2bc066aaee7ca3199c6cb4eb (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I469f258c4838f87edaedc8620d925a3c537d1619
Diffstat (limited to 'src/multimedia/audio')
| -rw-r--r-- | src/multimedia/audio/qsoundeffect_qaudio_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp index 835f60b45..524c856a2 100644 --- a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp +++ b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp @@ -369,7 +369,7 @@ void PrivateSoundSource::stateChanged(QAudio::State state) qint64 PrivateSoundSource::readData( char* data, qint64 len) { - if (m_runningCount > 0 && m_playing) { + if ((m_runningCount > 0 || m_runningCount == QSoundEffect::Infinite) && m_playing) { if (m_sample->state() != QSample::Ready) return 0; |