summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/qaudiooutput_alsa_p.cpp
diff options
context:
space:
mode:
authorBernd Weimer <bweimer@blackberry.com>2013-05-27 12:58:59 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-11 13:39:46 +0200
commit1410fda0ffddd7501033fe192e02d87c4c2a858b (patch)
treed6afd99938d74fd9a13ab1b440db0e94b7c87ad6 /src/multimedia/audio/qaudiooutput_alsa_p.cpp
parent9785766067aea72da13b1c7821295254d4fabb78 (diff)
Purged ALSA implementation
Avoided potential memory leak and null pointer access, removed unused variables, reduced redundant code, etc. Change-Id: Ia0ddf56a7a1a0f142f2edb070c2c0b32cbf76ce7 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/multimedia/audio/qaudiooutput_alsa_p.cpp')
-rw-r--r--src/multimedia/audio/qaudiooutput_alsa_p.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
index 1384dfdc5..3a779f322 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
@@ -125,7 +125,7 @@ void QAudioOutputPrivate::async_callback(snd_async_handler_t *ahandler)
audioOut = static_cast<QAudioOutputPrivate*>
(snd_async_handler_get_callback_private(ahandler));
- if((audioOut->deviceState==QAudio::ActiveState)||(audioOut->resuming))
+ if (audioOut && (audioOut->deviceState == QAudio::ActiveState || audioOut->resuming))
audioOut->feedback();
}