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
@@ -282,12 +282,14 @@ void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) {
 
 
 /**
  * Action that are toggled on hold (mostly QPopups i guess)
  */
 void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) {
+    if (!item )
+        return;
 
     QPopupMenu *menu = new QPopupMenu();
     int ret=0;
 
     if ( ((BTListItem*)item)->type() == "device") {
 
@@ -339,15 +341,15 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         BTServiceItem* service = (BTServiceItem*)item;
         QMap<int, QString> list = service->services().classIdList();
         QMap<int, QString>::Iterator it = list.begin();
         QPopupMenu *popup =0l;
         if ( it != list.end() ) {
 	    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 {
 	    qWarning("Empty");
 	}
 
         if ( popup == 0l ) {
             qWarning("factory returned 0l");
@@ -356,23 +358,24 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
 
         int test1 = popup->insertItem( tr("Test1:"),  0);
         int con = popup->insertItem( tr("connect"), 1);
         int del = popup->insertItem( tr("delete"),  2);
 
         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 ) {
             // take item first? -zecke
             delete item;
         }
+        delete popup;
     }
     delete menu;
 }
 
 
 /**