diff options
| author | andreask@activestate.com <andreas_kupries> | 2006-07-14 18:24:09 (GMT) |
|---|---|---|
| committer | andreask@activestate.com <andreas_kupries> | 2006-07-14 18:24:09 (GMT) |
| commit | 24630c7d3153085d4b5964d1ad3e1cfd9d419638 (patch) | |
| tree | b8ef9aedb5e83513b8c3c741838f2180de78673f /generic | |
| parent | fd1457277f558259a806c3f4804aa084584a2211 (diff) | |
| download | tk-24630c7d3153085d4b5964d1ad3e1cfd9d419638.zip tk-24630c7d3153085d4b5964d1ad3e1cfd9d419638.tar.gz tk-24630c7d3153085d4b5964d1ad3e1cfd9d419638.tar.bz2 | |
* generic/tkWindow.c (Initialize): Modify change of 2006-05-25
(jeffh). Release mutex a bit earlier, to prevent lock when OS X
creates its console windows (recursively enters Tk_Init). Patch
by JeffH.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkWindow.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c index d3e38c4..266ebeb 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWindow.c,v 1.56.2.9 2006/05/25 23:51:02 hobbs Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.56.2.10 2006/07/14 18:24:09 andreas_kupries Exp $ */ #include "tkPort.h" @@ -3159,9 +3159,15 @@ Initialize(interp) /* * Invoke platform-specific initialization. + * Unlock mutex before entering TkpInit, as that may run through the + * Tk_Init routine again for the console window interpreter. */ - code = TkpInit(interp); + Tcl_MutexUnlock(&windowMutex); + if (argv != NULL) { + ckfree((char *) argv); + } + return TkpInit(interp); done: Tcl_MutexUnlock(&windowMutex); |