wxOSX/Carbon compilation fix after the changes of r72207.

[wxWidgets.git] / src / common / socket.cpp

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 0d619a77c2f239f7b83cf12088cc0fc98d10f8f6..6f32e83791aa4a74fffb14f3e637425594464cf0 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -887,8 +887,12 @@ bool wxSocketBase::Destroy()
     Notify(false);
 
     // Schedule this object for deletion instead of destroying it right now if
     Notify(false);
 
     // Schedule this object for deletion instead of destroying it right now if

-    // possible as we may have other events pending for it
-    if ( wxTheApp )
+    // it can have other events pending for it and we have a way to do it.
+    //
+    // Notice that sockets used in other threads won't have any events for them
+    // and we shouldn't use delayed destruction mechanism for them as it's not
+    // MT-safe.
+    if ( wxIsMainThread() && wxTheApp )

     {
         wxTheApp->ScheduleForDestruction(this);
     }
     {
         wxTheApp->ScheduleForDestruction(this);
     }