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

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon/xine
From:       Matthias Kretz <kretz () kde ! org>
Date:       2008-02-29 22:08:48
Message-ID: 1204322928.976475.16458.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780744 by mkretz:

delete the cleanupObjects after the XineThread has quit() since there might still be \
some rewires going on that rely on the xine objects referenced by the cleanupObjects

CCBUG: 157455
This could potentially solve #157455 but the backtrace in the reports is missing xine \
debug info to make any better guess.

 M  +14 -9     xineengine.cpp  


--- trunk/KDE/kdebase/runtime/phonon/xine/xineengine.cpp #780743:780744
@@ -81,15 +81,6 @@
         /*if (m_thread) {
             m_thread->stopAllStreams();
         }*/
-        QList<QObject *> cleanupObjects(m_cleanupObjects);
-        const QList<QObject *>::Iterator end = cleanupObjects.end();
-        QList<QObject *>::Iterator it = cleanupObjects.begin();
-        while (it != end) {
-            kDebug(610) << "delete" << (*it)->metaObject()->className();
-            delete *it;
-            ++it;
-        }
-        //qDeleteAll(cleanupObjects);
         if (m_thread) {
             m_thread->quit();
             if (!m_thread->wait(10000)) {
@@ -101,6 +92,20 @@
             }
             delete m_thread;
         }
+
+        QList<QObject *> cleanupObjects(m_cleanupObjects);
+#if 0
+        qDeleteAll(cleanupObjects);
+#else
+        const QList<QObject *>::Iterator end = cleanupObjects.end();
+        QList<QObject *>::Iterator it = cleanupObjects.begin();
+        while (it != end) {
+            kDebug(610) << "delete" << (*it)->metaObject()->className();
+            delete *it;
+            ++it;
+        }
+#endif
+
         //kDebug(610) ;
         if (m_nullPort) {
             xine_close_audio_driver(m_xine, m_nullPort);


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