1 files changed, 9 insertions, 6 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index c81d4d1..ec05a95 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -287,2 +287,4 @@ void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) {
 void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) {
+    if (!item )
+        return;
 
@@ -344,5 +346,5 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
             qWarning("Searching id %d %s", it.key(), it.data().latin1() );
-            popup = m_popHelper.find( it.key(),
+            popup = m_popHelper.find( it.key() /*1*/,
                                       service->services(),
-                                      service->parent() );
+                                      (BTDeviceItem*)service->parent() );
         }else {
@@ -361,9 +363,9 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         ret = popup->exec( point );
-
+        qWarning("returned from exec() ");
         if ( ret == -1 )
-            delete popup;
+            ;
         else if ( ret == test1 )
-            delete popup;
+            ;
         else if ( ret == con )
-            delete popup;
+            ;
         else if ( ret == del ) {
@@ -372,2 +374,3 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         }
+        delete popup;
     }