summaryrefslogtreecommitdiffstats
path: root/win/tclWinSock.c
diff options
context:
space:
mode:
Diffstat (limited to 'win/tclWinSock.c')
-rw-r--r--win/tclWinSock.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 7b63168..688df20 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinSock.c,v 1.13 1999/07/22 23:45:53 redman Exp $
+ * RCS: @(#) $Id: tclWinSock.c,v 1.14 1999/07/27 01:42:25 redman Exp $
*/
#include "tclWinInt.h"
@@ -583,7 +583,16 @@ SocketThreadExitHandler(clientData)
(ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
if (tsdPtr->socketThread != NULL) {
+ Tcl_MutexLock(&socketMutex);
TerminateThread(tsdPtr->socketThread, 0);
+
+ /*
+ * Wait for the thread to terminate. This ensures that we are
+ * completely cleaned up before we leave this function.
+ */
+
+ WaitForSingleObject(tsdPtr->socketThread, INFINITE);
+ Tcl_MutexUnlock(&socketMutex);
}
if (tsdPtr->hwnd != NULL) {
DestroyWindow(tsdPtr->hwnd);