diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 14:25:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 14:25:10 +0100 |
| commit | 7610f6e9ba8b92df6d18b94fcec982064dffacbd (patch) | |
| tree | 65653559c62cc451258543b87ff971371e8d8e05 /src/multimedia/audio | |
| parent | ac6f9d27b1610356303714c3f8d2f2ab2ca5883a (diff) | |
| parent | 365e05bad8c4a42a449eeef257a16c6f8faca318 (diff) | |
| download | qtmultimedia-7610f6e9ba8b92df6d18b94fcec982064dffacbd.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I2e4e9cca01d63ed0d1e7f71c7a58322390696036
Diffstat (limited to 'src/multimedia/audio')
| -rw-r--r-- | src/multimedia/audio/qsoundeffect_qaudio_p.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp index 978cfd2dd..7dcbf934a 100644 --- a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp +++ b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp @@ -359,7 +359,8 @@ void PrivateSoundSource::stateChanged(QAudio::State state) #ifdef QT_QAUDIO_DEBUG qDebug() << this << "stateChanged " << state; #endif - if (state == QAudio::IdleState && m_runningCount == 0) + if ((state == QAudio::IdleState && m_runningCount == 0) + || (state == QAudio::StoppedState && m_audioOutput->error() != QAudio::NoError)) emit soundeffect->stop(); } |