diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-25 08:08:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-25 08:08:20 (GMT) |
| commit | 5200f708c46d4bc737d6706691965c726c063292 (patch) | |
| tree | 6e2e8dee38be3224e765cfba26048399ad1ffad8 /src/gui/kernel | |
| parent | cb34d11e4c98e768432e00c867b3321d3b89dd9d (diff) | |
| parent | e1cde7c26b4923299b78e6165416788fbf8cd30e (diff) | |
| download | Qt-5200f708c46d4bc737d6706691965c726c063292.zip Qt-5200f708c46d4bc737d6706691965c726c063292.tar.gz Qt-5200f708c46d4bc737d6706691965c726c063292.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
fix inf loop bug
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qsound_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qsound_s60.cpp b/src/gui/kernel/qsound_s60.cpp index df2830b..accfce2 100644 --- a/src/gui/kernel/qsound_s60.cpp +++ b/src/gui/kernel/qsound_s60.cpp @@ -150,7 +150,7 @@ void QAuServerS60::playCompleted(QAuBucketS60 *bucket, int error) } else { // We don't have a way to inform about errors -> just decrement loops // in order that QSound::isFinished will return true; - while (decLoop(sound)) {} + while (decLoop(sound) > 0) {} if (staticPlayingSounds.removeAll(sound)) delete sound; } |