1 files changed, 14 insertions, 8 deletions

diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 83accf7..7311484 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -46,44 +46,45 @@ void Manager::isAvailable( const QString& device ){
     *l2ping << "l2ping" << "-c1" << device;
     connect(l2ping, SIGNAL(processExited(Opie::Core::OProcess* ) ),
             this, SLOT(slotProcessExited(Opie::Core::OProcess*) ) );
     if (!l2ping->start() ) {
         emit available( device,  false );
         delete l2ping;
     }
 
 }
 
 void Manager::isAvailable( Device* /*dev*/ ){
 
 
 }
 void Manager::searchDevices( const QString& device ){
     odebug << "Manager: search devices" << oendl;
-    OProcess* hcitool = new OProcess();
-    hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() );
-    *hcitool << "hcitool" << "scan";
-    connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) ,
+    m_hcitool = new OProcess();
+    m_hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() );
+    *m_hcitool << "hcitool" << "scan";
+    connect( m_hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) ,
              this, SLOT(slotHCIExited(Opie::Core::OProcess* ) ) );
-    connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ),
+    connect( m_hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ),
              this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) );
-    if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
+    if (!m_hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         odebug << "Manager: could not start" << oendl;
         RemoteDevice::ValueList list;
         emit foundDevices( device, list );
-        delete hcitool;
+        delete m_hcitool;
+        m_hcitool = 0;
     }
 }
 
 void Manager::searchDevices(Device* /*d*/ ){
 
 
 }
 void Manager::addService(const QString& name ){
     OProcess proc;
     proc << "sdptool" << "add" << name;
     bool bo = true;
     if (!proc.start(OProcess::DontCare ) )
         bo = false;
     emit addedService( name,  bo );
 }
 void Manager::addServices(const QStringList& list){
@@ -92,43 +93,44 @@ void Manager::addServices(const QStringList& list){
         addService( (*it) );
 }
 void Manager::removeService( const QString& name ){
     OProcess prc;
     prc << "sdptool" << "del" << name;
     bool bo = true;
     if (!prc.start(OProcess::DontCare ) )
         bo = false;
     emit removedService( name,  bo );
 }
 void Manager::removeServices( const QStringList& list){
     QStringList::ConstIterator it;
     for (it = list.begin(); it != list.end(); ++it )
         removeService( (*it) );
 }
 void Manager::searchServices( const QString& remDevice ){
-    OProcess *m_sdp =new OProcess();
+    m_sdp =new OProcess();
     *m_sdp << "sdptool" << "browse" << remDevice;
     m_sdp->setName( remDevice.latin1() );
     odebug << "Manager: search Services for " << remDevice.latin1() << oendl;
     connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ),
             this, SLOT(slotSDPExited(Opie::Core::OProcess* ) ) );
     connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int ) ),
             this, SLOT(slotSDPOut(Opie::Core::OProcess*, char*, int) ) );
     if (!m_sdp->start(OProcess::NotifyOnExit,  OProcess::AllOutput) ) {
         odebug << "Manager: could not start sdptool" << oendl;
         delete m_sdp;
+        m_sdp = 0;
         Services::ValueList list;
         emit foundServices( remDevice, list );
     }
 }
 void Manager::searchServices( const RemoteDevice& dev){
     searchServices( dev.mac() );
 }
 QString Manager::toDevice( const QString& /*mac*/ ){
     return QString::null;
 }
 QString Manager::toMac( const QString &/*device*/ ){
     return QString::null;
 }
 void Manager::slotProcessExited(OProcess* proc ) {
     bool conn= false;
     if (proc->normalExit() && proc->exitStatus() == 0 )
@@ -152,55 +154,59 @@ void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
     m_out.replace( proc->name(), string );
 
 }
 void Manager::slotSDPExited( OProcess* proc)
 {
     odebug << "Manager: proc name " << proc->name() << oendl;
     Services::ValueList  list;
     if (proc->normalExit()  ) {
         QMap<QString, QString>::Iterator it = m_out.find( proc->name() );
         if ( it != m_out.end() ) {
         odebug << "Manager: found process" << oendl;
             list = parseSDPOutput( it.data() );
             m_out.remove( it );
         }
     }
     emit foundServices( proc->name(), list );
+    if (proc == m_sdp)
+        m_sdp = 0;
     delete proc;
 }
 Services::ValueList Manager::parseSDPOutput( const QString& out ) {
     Services::ValueList list;
     odebug << "Manager: parsing output" << oendl;
     Parser parser( out );
     list = parser.services();
     return list;
 }
 
 void Manager::slotHCIExited(OProcess* proc ) {
     odebug << "Manager: process exited" << oendl;
     RemoteDevice::ValueList list;
     if (proc->normalExit() ) {
         odebug << "Manager: normalExit " << proc->name() << oendl;
         QMap<QString, QString>::Iterator it = m_devices.find(proc->name() );
         if (it != m_devices.end() ) {
             odebug << "Manager: != end ;)" << oendl;
             list = parseHCIOutput( it.data() );
             m_devices.remove( it );
         }
     }
     emit foundDevices( proc->name(), list );
+    if (proc == m_hcitool)
+        m_hcitool = 0;
     delete proc;
 }
 void Manager::slotHCIOut(OProcess* proc,  char* ch,  int len) {
     QCString str( ch, len+1 );
     odebug << "Manager: hci: " << str.data() << oendl;
     QMap<QString, QString>::Iterator it;
     it = m_devices.find( proc->name() );
     odebug << "Manager: proc->name " << proc->name() << oendl;
     QString string;
     if (it != m_devices.end() ) {
         odebug << "Manager: slotHCIOut " << oendl;
         string = it.data();
     }
     string.append( str );
 
     m_devices.replace( proc->name(),  string );