diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-03-10 02:06:52 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-03-10 02:06:52 (GMT) |
| commit | 346b0f6247f1f8ca967f6686a849aa7464cb6b87 (patch) | |
| tree | d0fe402665abd28f31a13638e93af8a6759e43e4 /src/multimedia | |
| parent | 83e73a69d5a1c6b94c5c83f91141f35d65d27f36 (diff) | |
| download | Qt-346b0f6247f1f8ca967f6686a849aa7464cb6b87.zip Qt-346b0f6247f1f8ca967f6686a849aa7464cb6b87.tar.gz Qt-346b0f6247f1f8ca967f6686a849aa7464cb6b87.tar.bz2 | |
Fixed deadlock introduced by change
83e73a69d5a1c6b94c5c83f91141f35d65d27f36.
alsa callback was deadlocking with QEventDispatcherGlib.
Reviewed-by:Dmytro Poplavskiy
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_alsa_p.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp index 7eb38b6..1cef335 100644 --- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp +++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp @@ -648,9 +648,10 @@ void QAudioOutputPrivate::userFeed() void QAudioOutputPrivate::feedback() { - QMetaObject::invokeMethod(this, "updateAvailable", Qt::QueuedConnection); + updateAvailable(); } + void QAudioOutputPrivate::updateAvailable() { #ifdef DEBUG_AUDIO |