diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 22:17:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 22:17:12 (GMT) |
| commit | 81a86620bc6664f6b08ea0c1bec89192717c0343 (patch) | |
| tree | 26b7c71388d047a42f94706dd951eafaf0bd6848 /src | |
| parent | 6f546de96cc6e841bff8febf29cbf351f4ca49f7 (diff) | |
| parent | 747a4dfc5a333c2f7066d344f7da1684226551bd (diff) | |
| download | Qt-81a86620bc6664f6b08ea0c1bec89192717c0343.zip Qt-81a86620bc6664f6b08ea0c1bec89192717c0343.tar.gz Qt-81a86620bc6664f6b08ea0c1bec89192717c0343.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
SIGSEGV after QAudioOutput closed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_win32_p.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp index c5792b6..f3ba079 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.cpp +++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp @@ -455,6 +455,9 @@ void QAudioOutputPrivate::feedback() bool QAudioOutputPrivate::deviceReady() { + if(deviceState == QAudio::StoppedState) + return false; + if(pullMode) { int chunks = bytesAvailable/period_size; #ifdef DEBUG_AUDIO |