diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-15 03:00:51 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-15 03:00:51 +0200 |
| commit | 3ee5afe3a47152ab3a2d4a9acf3a5e0458441c98 (patch) | |
| tree | 3ec63ae7b0a8be146b7fed8676fcbe5cdded3f01 /src | |
| parent | 1ca79e8645f9f3cf471c32cf9fd2894a4b41bcb1 (diff) | |
| parent | 2c5efb49495e31afa399a1c1ea003a9b630ba113 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I70d51b09681a77e72ecad764e37697d0a1bb85a5
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/pulseaudio/qaudiooutput_pulse.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp index 38cf54979..ea7a2be0c 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp @@ -447,7 +447,7 @@ void QPulseAudioOutput::userFeed() int audioBytesPulled = m_audioSource->read(m_audioBuffer, input); Q_ASSERT(audioBytesPulled <= input); - if (audioBytesPulled > 0) { + if (m_audioBuffer && audioBytesPulled > 0) { if (audioBytesPulled > input) { qWarning() << "QPulseAudioOutput::userFeed() - Invalid audio data size provided from user:" << audioBytesPulled << "should be less than" << input; |