diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2016-02-11 13:11:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2016-02-11 13:11:28 (GMT) |
| commit | 7babf90b1f29cb18644b318530c4128afa175b12 (patch) | |
| tree | 2f71efb515e3b4b66bd75db15029e833c0a3a330 /generic | |
| parent | 114acc068a9d07f1f5785852dbfc154bb4ea87f7 (diff) | |
| download | tk-7babf90b1f29cb18644b318530c4128afa175b12.zip tk-7babf90b1f29cb18644b318530c4128afa175b12.tar.gz tk-7babf90b1f29cb18644b318530c4128afa175b12.tar.bz2 | |
(cherry-pick): Fix crash in TkFinalize() if Tk_Init() is never called. Suggested by Brian Griffin.
FossilOrigin-Name: 8a474c4e9371ae2dae7cbcf4297da67ee785c216
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkEvent.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/generic/tkEvent.c b/generic/tkEvent.c index 03e7283..747555e 100644 --- a/generic/tkEvent.c +++ b/generic/tkEvent.c @@ -2047,6 +2047,12 @@ TkFinalize( { ExitHandler *exitPtr; +#if defined(_WIN32) && !defined(STATIC_BUILD) + if (!tclStubsPtr) { + return; + } +#endif + Tcl_DeleteExitHandler(TkFinalize, NULL); Tcl_MutexLock(&exitMutex); |