Diffstat (limited to 'noncore/net/opietooth/manager/bluebase.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 15 |
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 @@ -286,4 +286,6 @@ void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) { */ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) { + if (!item ) + return; QPopupMenu *menu = new QPopupMenu(); @@ -343,7 +345,7 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin 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"); @@ -360,15 +362,16 @@ 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 ) { // take item first? -zecke delete item; } + delete popup; } delete menu; |