[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/phonon/platform_kde
From:       Matthias Kretz <kretz () kde ! org>
Date:       2007-08-27 18:52:05
Message-ID: 1188240725.963406.19984.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 705329 by mkretz:

clean up the KIO Job on destruction

 M  +13 -1     kiomediastream.cpp  


--- trunk/KDE/kdelibs/phonon/platform_kde/kiomediastream.cpp #705328:705329
@@ -31,11 +31,13 @@
 KioMediaStream::KioMediaStream(const QUrl &url, QObject *parent)
     : AbstractMediaStream(*new KioMediaStreamPrivate(url), parent)
 {
+    kDebug(600);
     reset();
 }
 
 void KioMediaStream::reset()
 {
+    kDebug(600);
     Q_D(KioMediaStream);
     if (d->kiojob) {
         d->kiojob->disconnect(this);
@@ -73,6 +75,16 @@
 
 KioMediaStream::~KioMediaStream()
 {
+    kDebug(600);
+    Q_D(KioMediaStream);
+    if (d->kiojob) {
+        d->kiojob->disconnect(this);
+        KIO::FileJob *filejob = qobject_cast<KIO::FileJob *>(d->kiojob);
+        if (filejob) {
+            filejob->close();
+        }
+        d->kiojob->kill();
+    }
 }
 
 void KioMediaStream::needData()
@@ -100,7 +112,7 @@
 void KioMediaStream::enoughData()
 {
     Q_D(KioMediaStream);
-    kDebug(600) ;
+    kDebug(600);
     // Don't suspend when using a FileJob. The FileJob is controlled by calls to
     // FileJob::read()
     if (d->kiojob && !qobject_cast<KIO::FileJob *>(d->kiojob) && !d->kiojob->isSuspended()) {
[prev in list] [next in list] [prev in thread] [next in thread]