destroys all child processes on the window closure. patch courtesy Dmitriy Korovkin

2 files changed, 26 insertions, 16 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
@@ -35,6 +35,5 @@ BtObex::BtObex( QObject *parent, const char* name )
 
 BtObex::~BtObex() {
-    if (btManager)
-        delete btManager;
+    delete btManager;
     delete m_rec;
     delete m_send;
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
@@ -93,7 +93,8 @@ void SendWidget::setReceiverStatus( int id, const QString& status ) {
 
 void SendWidget::slotIrDaDevices( const QStringList& list) {
-    for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
-	int id = addReceiver(*it, "obex/irda.png");
-	m_irDa.insert( id, (*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."));
@@ -103,6 +104,7 @@ void SendWidget::slotIrDaDevices( const QStringList& list) {
 
 void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
-    for(QMap<QString, QString>::ConstIterator it = str.begin(); it != str.end(); ++it ) {
-	int id = addReceiver(it.key(), "obex/bt.png");
+    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() ) );
     }
@@ -140,6 +142,7 @@ void SendWidget::slotIrTry(unsigned int 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;
@@ -152,5 +155,5 @@ void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) {
     if ( str == "devices(QStringMap)" ) {
         QDataStream stream( ar, IO_ReadOnly );
-	QMap<QString, QString> btmap;
+        QMap<QString, QString> btmap;
         stream >> btmap;
         slotBTDevices( btmap );
@@ -172,5 +175,5 @@ void SendWidget::slotStartBt() {
     // skip past unselected receivers
     while((m_btIt != m_bt.end()) && !receiverSelected(m_btIt.key()))
-	  ++m_btIt;
+        ++m_btIt;
     if (m_btIt == m_bt.end() ) {
         btStatus->setText(tr("complete."));
@@ -223,12 +226,20 @@ void SendWidget::toggle_receiver(QListViewItem* item)
         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()");
+    }
 }