diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-11 08:45:54 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-11 08:45:54 +1000 |
| commit | 6bb93ab2fd79ae0a04c826d9027503b644b6e374 (patch) | |
| tree | 060d9765cf3f009c86fe6e421dac4ea8930d076e /src/3rdparty/phonon/phonon/mediasource.cpp | |
| parent | 40db84c97769141f3f2351de1b2d5c64904fe5c2 (diff) | |
| parent | 6c3c9d812a730d5bc1bcd6261befe077a65be594 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/phonon/phonon/mediasource.cpp')
| -rw-r--r-- | src/3rdparty/phonon/phonon/mediasource.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/phonon/mediasource.cpp b/src/3rdparty/phonon/phonon/mediasource.cpp index 0a21c8766..c003af988 100644 --- a/src/3rdparty/phonon/phonon/mediasource.cpp +++ b/src/3rdparty/phonon/phonon/mediasource.cpp @@ -140,8 +140,12 @@ MediaSourcePrivate::~MediaSourcePrivate() { #ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM if (autoDelete) { - delete stream; - delete ioDevice; + //here we use deleteLater because this object + //might be destroyed from another thread + if (stream) + stream->deleteLater(); + if (ioDevice) + ioDevice->deleteLater(); } #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM } |