diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:00:31 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:00:31 +0100 |
| commit | 365e05bad8c4a42a449eeef257a16c6f8faca318 (patch) | |
| tree | 6e1b17ccad9fe81a1007ff2301a6873c72b22759 /src/plugins/pulseaudio | |
| parent | 02b8c7527a88d1cfaed296b856fce63fd62a6c9e (diff) | |
| parent | 42dc97388137b753fbe7dc77371a51dfbd98d127 (diff) | |
| download | qtmultimedia-365e05bad8c4a42a449eeef257a16c6f8faca318.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I6d88b17f44479a522d181374023648dd007112bd
Diffstat (limited to 'src/plugins/pulseaudio')
| -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 533cd674c..a654af86c 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp @@ -555,7 +555,7 @@ void QPulseAudioOutput::resume() m_tickTimer->start(m_periodTime); - setState(QAudio::ActiveState); + setState(m_pullMode ? QAudio::ActiveState : QAudio::IdleState); setError(QAudio::NoError); } } |