fixes potential crash under gatekeeper

[wxWidgets.git] / samples / ipc / baseserver.cpp

diff --git a/samples/ipc/baseserver.cpp b/samples/ipc/baseserver.cpp
index 80581e576082ede9aa3daa563ccb194cc635f04b..fc5e88c65bb79426ea0703b2845af364cda1dd04 100644 (file)
--- a/samples/ipc/baseserver.cpp
+++ b/samples/ipc/baseserver.cpp
@@ -7,7 +7,7 @@
 // Created:     2007-11-08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2007 Anders Larsen
 // Created:     2007-11-08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2007 Anders Larsen

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -104,7 +104,7 @@ private:
     // should we notify the client about changes to m_item?
     bool m_advise;
 
     // should we notify the client about changes to m_item?
     bool m_advise;
 

-    DECLARE_NO_COPY_CLASS(BenchConnection)
+    wxDECLARE_NO_COPY_CLASS(BenchConnection);

 };
 
 // a simple server accepting connections to IPC_TOPIC and IPC_BENCHMARK_TOPIC
 };
 
 // a simple server accepting connections to IPC_TOPIC and IPC_BENCHMARK_TOPIC


@@ -211,8 +211,7 @@ void MyServer::Disconnect()
     if ( m_connection )
     {
         m_connection->Disconnect();
     if ( m_connection )
     {
         m_connection->Disconnect();

-        delete m_connection;
-        m_connection = NULL;
+        wxDELETE(m_connection);

         wxLogMessage("Disconnected client");
     }
 }
         wxLogMessage("Disconnected client");
     }
 }


@@ -376,7 +375,9 @@ bool BenchConnection::OnPoke(const wxString& topic,
     if ( m_advise )
     {
         if ( !Advise(item, m_item) )
     if ( m_advise )
     {
         if ( !Advise(item, m_item) )

+        {

             wxLogMessage("Failed to advise client about the change.");
             wxLogMessage("Failed to advise client about the change.");

+        }

     }
 
     return true;
     }
 
     return true;