2 files changed, 20 insertions, 10 deletions

diff --git a/core/obex/btobex.cpp b/core/obex/btobex.cpp
index b8556da..886f3dc 100644
--- a/core/obex/btobex.cpp
+++ b/core/obex/btobex.cpp
@@ -29,17 +29,16 @@ BtObex::BtObex( QObject *parent, const char* name )
     connect( this, SIGNAL(error(int) ), // for recovering to receive
              SLOT(slotError() ) );
     connect( this, SIGNAL(sent(bool) ),
              SLOT(slotError() ) );
     btManager = NULL;
 };
 
 BtObex::~BtObex() {
-    if (btManager)
         delete btManager;
     delete m_rec;
     delete m_send;
 }
 
 void BtObex::receive()  {
     m_receive = true;
     m_outp = QString::null;
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index dbbb7b3..8432d16 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -87,27 +87,29 @@ bool SendWidget::receiverSelected(int id)
 }
 
 void SendWidget::setReceiverStatus( int id, const QString& status ) {
     if ( !receivers.contains(id) ) return;
     receivers[id]->setText(3, status );
 }
 
 void SendWidget::slotIrDaDevices( const QStringList& list) {
-    for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
+    for (QStringList::ConstIterator it = list.begin(); 
+        it != list.end(); ++it ) {
 	int id = addReceiver(*it, "obex/irda.png");
 	m_irDa.insert( id, (*it) );
     }
     irdaStatus->setText( tr("ready."));
     m_irDaIt = m_irDa.begin();
 
 }
 
 void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
-    for(QMap<QString, QString>::ConstIterator it = str.begin(); it != str.end(); ++it ) {
+    for(QMap<QString, QString>::ConstIterator it = str.begin(); 
+        it != str.end(); ++it ) {
 	int id = addReceiver(it.key(), "obex/bt.png");
         m_bt.insert( id, Pair( it.key(), it.data() ) );
     }
     btStatus->setText(tr("ready."));
     m_btIt = m_bt.begin();
 
 }
 void SendWidget::slotSelectedDevice( int, int ) {
@@ -134,18 +136,19 @@ void SendWidget::slotIrSent( bool b) {
     setReceiverStatus( m_irDaIt.key(), text );
     ++m_irDaIt;
     slotStartIrda();
 }
 void SendWidget::slotIrTry(unsigned int trI) {
     setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) ));
 }
 void SendWidget::slotStartIrda() {
-	if ( !m_irDa.count() ) return;
-    if ( m_irDaIt == m_irDa.end() ) {
+    if ( !m_irDa.count() ) 
+        return;
+    if ( m_irDaIt == m_irDa.end() || !receiverSelected(m_irDaIt.key())) {
         irdaStatus->setText(tr("complete."));
         return;
     }
     setReceiverStatus( m_irDaIt.key(), tr("Start sending") );
     m_obex->send( m_file );
 }
 
 void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) {
@@ -217,24 +220,32 @@ void SendWidget::scan_for_receivers()
 }
 
 void SendWidget::toggle_receiver(QListViewItem* item)
 {
     // toggle the state of an individual receiver.
     if(item->pixmap(2))
         item->setPixmap(2,QPixmap());
     else
-        item->setPixmap(2,Resource::loadPixmap("backup/check.png"));
+        item->setPixmap(2,Resource::loadPixmap("obex/check.png"));
 }
 
 
-void SendWidget::closeEvent( QCloseEvent* e) {
-    obexSendBase::closeEvent(e);
-    QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()");
-    QCopEnvelope e1("QPE/Bluetooth", "disableBluetooth()");
+void SendWidget::closeEvent( QCloseEvent* evt) {
+    delete m_obex;
+    m_obex = NULL;
+    delete m_btobex;
+    m_btobex = NULL;
+    obexSendBase::closeEvent(evt);
+    {
+        QCopEnvelope e("QPE/IrDaApplet", "disableIrda()");
+    }
+    {
+        QCopEnvelope e("QPE/Bluetooth", "disableBluetooth()");
+    }
 }
 
 void SendWidget::userDone() {
     close();
 }
 
 QString SendWidget::file()const {
     return m_file;