diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2009-11-11 03:42:50 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2009-11-12 05:39:36 (GMT) |
| commit | 39a5111d292f69ece4deb6c4cd9f294a94c5cf19 (patch) | |
| tree | e937c4e6cc9bc6b1df4373c6d491fe5923202972 /src/3rdparty | |
| parent | 560d39aafb39c810a77948f04ddcdc568ac2b19d (diff) | |
| download | Qt-39a5111d292f69ece4deb6c4cd9f294a94c5cf19.zip Qt-39a5111d292f69ece4deb6c4cd9f294a94c5cf19.tar.gz Qt-39a5111d292f69ece4deb6c4cd9f294a94c5cf19.tar.bz2 | |
Import change 924855 from phonon-svn.
r924855 | mkretz | 2009-02-12 05:49:12 +1000 (Thu, 12 Feb 2009) | 1 line
forwardport: two more adaptor accesses where adaptor might be 0
Reviewed-by: Justin McPherson
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/phonon/audiooutput.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/phonon/audiooutput.cpp b/src/3rdparty/phonon/phonon/audiooutput.cpp index e54ec1f..3d03dc4 100644 --- a/src/3rdparty/phonon/phonon/audiooutput.cpp +++ b/src/3rdparty/phonon/phonon/audiooutput.cpp @@ -126,7 +126,9 @@ void AudioOutput::setName(const QString &newName) d->name = newName; setVolume(Platform::loadVolume(newName)); #ifndef QT_NO_DBUS - emit d->adaptor->nameChanged(newName); + if (d->adaptor) { + emit d->adaptor->nameChanged(newName); + } #endif } @@ -403,7 +405,9 @@ void AudioOutputPrivate::handleAutomaticDeviceChange(const AudioOutputDevice &de AudioOutputPrivate::~AudioOutputPrivate() { #ifndef QT_NO_DBUS - emit adaptor->outputDestroyed(); + if (adaptor) { + emit adaptor->outputDestroyed(); + } #endif } |