diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 03:02:21 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 03:02:21 +0100 |
| commit | 4bb439c8af69448a7453f9409a7ff15b1e69b72d (patch) | |
| tree | 50b436863ed1d8b4028f8ddac9d28e08d203d63a /src/multimedia | |
| parent | 2bebbc5dd1492c0e26183967ce3432748a56e3cd (diff) | |
| parent | fa5744670ce9c5fdee65a98337e4d6bb5146c981 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Iaf74b2b0f03af46942beaa5aa1fc61296a66ec47
Diffstat (limited to 'src/multimedia')
| -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 e501d3217..ac4dd9cf9 100644 --- a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp +++ b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp @@ -348,7 +348,7 @@ void PrivateSoundSource::sampleReady() m_sampleReady = true; soundeffect->setStatus(QSoundEffect::Ready); - if (m_playing) + if (m_playing && m_audioOutput->state() == QAudio::StoppedState) m_audioOutput->start(this); } |