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/plugins/pulseaudio | |
| parent | ac6f9d27b1610356303714c3f8d2f2ab2ca5883a (diff) | |
| parent | 365e05bad8c4a42a449eeef257a16c6f8faca318 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I2e4e9cca01d63ed0d1e7f71c7a58322390696036
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 d0e8969ae..6cc9329dd 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp @@ -561,7 +561,7 @@ void QPulseAudioOutput::resume() m_tickTimer->start(m_periodTime); - setState(QAudio::ActiveState); + setState(m_pullMode ? QAudio::ActiveState : QAudio::IdleState); setError(QAudio::NoError); } } |