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

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/nowplaying
From:       Laurent Montel <montel () kde ! org>
Date:       2008-08-13 19:20:58
Message-ID: 1218655258.607745.31210.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 846618 by mlaurent:

Fix mem leak
Don't try to connect when engine doesn't exist


 M  +4 -4      controls.cpp  
 M  +10 -5     nowplaying.cpp  


--- trunk/KDE/kdeplasma-addons/applets/nowplaying/controls.cpp #846617:846618
@@ -6,10 +6,10 @@
 
 Controls::Controls(QGraphicsWidget *parent)
     : QGraphicsWidget(parent),
-      m_playpause(new Plasma::Icon),
-      m_stop(new Plasma::Icon),
-      m_prev(new Plasma::Icon),
-      m_next(new Plasma::Icon),
+      m_playpause(new Plasma::Icon(this)),
+      m_stop(new Plasma::Icon(this)),
+      m_prev(new Plasma::Icon(this)),
+      m_next(new Plasma::Icon(this)),
       m_layout(0),
       m_state(NoPlayer),
       m_caps(NoCaps)
--- trunk/KDE/kdeplasma-addons/applets/nowplaying/nowplaying.cpp #846617:846618
@@ -99,11 +99,16 @@
 
     setLayout(m_layout);
 
-    connect(dataEngine("nowplaying"), SIGNAL(sourceAdded(QString)),
-            SLOT(playerAdded(QString)));
-    connect(dataEngine("nowplaying"), SIGNAL(sourceRemoved(QString)),
-            SLOT(playerRemoved(QString)));
-
+    Plasma::DataEngine* nowPlayingEngine = dataEngine("nowplaying");
+    if ( nowPlayingEngine )
+    {
+        connect(nowPlayingEngine, SIGNAL(sourceAdded(QString)),
+                SLOT(playerAdded(QString)));
+        connect(nowPlayingEngine, SIGNAL(sourceRemoved(QString)),
+                SLOT(playerRemoved(QString)));
+    }
+    else
+        kDebug()<<" We can not get now playing engine";
     findPlayer();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]