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/alsa/qalsaaudiooutput.cpp | |
| parent | ac6f9d27b1610356303714c3f8d2f2ab2ca5883a (diff) | |
| parent | 365e05bad8c4a42a449eeef257a16c6f8faca318 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I2e4e9cca01d63ed0d1e7f71c7a58322390696036
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 ae4761e24..9fee690b5 100644 --- a/src/plugins/alsa/qalsaaudiooutput.cpp +++ b/src/plugins/alsa/qalsaaudiooutput.cpp @@ -657,7 +657,7 @@ void QAlsaAudioOutput::resume() } resuming = true; - deviceState = QAudio::ActiveState; + deviceState = pullMode ? QAudio::ActiveState : QAudio::IdleState; errorState = QAudio::NoError; timer->start(period_time/1000); |