[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdewebdev/quanta/components/debugger
From:       Linus McCabe <Linus () mccabe ! nu>
Date:       2005-09-24 9:47:06
Message-ID: 1127555226.157432.27145.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 463496 by linusmc:

bugfix: don't use deleteLater() where not needed, so port is properly closed.

 M  +6 -7      dbgp/dbgpnetwork.cpp  
 M  +11 -6     gubed/quantadebuggergubed.cpp  


--- branches/KDE/3.5/kdewebdev/quanta/components/debugger/dbgp/dbgpnetwork.cpp #463495:463496
@@ -70,11 +70,11 @@
       if(m_server->listen())
       {
         emit active(true);
-      emit networkError(i18n("Lisening on port %1").arg(service), true);
+        emit networkError(i18n("Lisening on port %1").arg(service), true);
       }
       else
       {
-        m_server->deleteLater();
+        delete m_server;
         m_server = NULL;
         emit active(false);
         emit networkError(i18n("Unable to listen on port %1").arg(service), true);
@@ -91,13 +91,14 @@
   {
     m_socket->flush();
     m_socket->close();
-    m_socket->deleteLater();
+    delete m_socket;
   }
 
   // Close the server
   if(m_server)
   {
-    m_server->deleteLater();
+    m_server->close();
+    delete m_server;
     m_server = NULL;
   }
 
@@ -159,8 +160,6 @@
     else
     {
       kdDebug(24002) << k_funcinfo << ", " << m_server->errorString() << endl;
-      m_socket->deleteLater();
-      m_socket = NULL;
     }
   }
 
@@ -204,7 +203,7 @@
 
   if(m_socket)
   {
-    m_socket->deleteLater();
+    delete m_socket;
     m_socket = NULL;
   }
 
--- branches/KDE/3.5/kdewebdev/quanta/components/debugger/gubed/quantadebuggergubed.cpp #463495:463496
@@ -71,10 +71,15 @@
     sendCommand("die", 0);
     m_socket->flush();
     m_socket->close();
+    delete m_socket;
+    m_socket = NULL;
   }
   if(m_server)
-    m_server->deleteLater();
-
+  {
+    m_server->close();
+    delete m_server;
+    m_server = NULL;
+  }
   emit updateStatus(DebuggerUI::NoSession);
 }
 
@@ -126,7 +131,7 @@
       else
       {
         emit updateStatus(DebuggerUI::NoSession);
-        m_server->deleteLater();
+        delete m_server;
         m_server = NULL;
         debuggerInterface()->enableAction("debug_connect", true);
         debuggerInterface()->enableAction("debug_disconnect", false);
@@ -151,12 +156,14 @@
     m_socket->close();
 
     m_socket->deleteLater();
+    m_socket = NULL;
   }
 
   // Close the server
   if(m_server)
   {
-    m_server->deleteLater();
+    m_server->close();
+    delete m_server;
     m_server = NULL;
   }
 
@@ -292,8 +299,6 @@
     else
     {
       kdDebug(24002) << k_funcinfo << ", " << m_server->errorString() << endl;
-      m_socket->deleteLater();
-      m_socket = NULL;
     }
   }
 
[prev in list] [next in list] [prev in thread] [next in thread]