diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-10 03:05:22 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-10 03:05:22 +0100 |
| commit | 9514bba6c6bb41e304b450544c6e6b69080572a5 (patch) | |
| tree | c263293631f8a4616e13bf19034e0fa1c314af24 /src/plugins/alsa/qalsaaudiooutput.cpp | |
| parent | 19477de84a64f412bca9ce2df62ab9adb3859da2 (diff) | |
| parent | 7f0a20ad066020d913faff636b8a0c5f61d2dfe0 (diff) | |
| download | qtmultimedia-9514bba6c6bb41e304b450544c6e6b69080572a5.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4ea49723c74c6dccf141b65f834b5d539d2ab9d7
Diffstat (limited to 'src/plugins/alsa/qalsaaudiooutput.cpp')
| -rw-r--r-- | src/plugins/alsa/qalsaaudiooutput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/alsa/qalsaaudiooutput.cpp b/src/plugins/alsa/qalsaaudiooutput.cpp index 5c8ae171c..ee5aee989 100644 --- a/src/plugins/alsa/qalsaaudiooutput.cpp +++ b/src/plugins/alsa/qalsaaudiooutput.cpp @@ -707,7 +707,7 @@ bool QAlsaAudioOutput::deviceReady() if(l > 0) { // Got some data to output - if(deviceState != QAudio::ActiveState) + if (deviceState != QAudio::ActiveState && deviceState != QAudio::IdleState) return true; qint64 bytesWritten = write(audioBuffer,l); if (bytesWritten != l) |