diff options
| author | donal.k.fellows@manchester.ac.uk <dkf> | 2009-07-22 07:46:42 (GMT) |
|---|---|---|
| committer | donal.k.fellows@manchester.ac.uk <dkf> | 2009-07-22 07:46:42 (GMT) |
| commit | 0da66df76e9773add049f2a110d55b2235043936 (patch) | |
| tree | bb6570da9b5ce82f00d1ad6eefe46c363ed7e084 | |
| parent | 2f65f1d1a0882f7686d92e9b11bbf09e9bc8f67a (diff) | |
| download | tk-0da66df76e9773add049f2a110d55b2235043936.zip tk-0da66df76e9773add049f2a110d55b2235043936.tar.gz tk-0da66df76e9773add049f2a110d55b2235043936.tar.bz2 | |
[Bug 2496114]: Ensure that focus desynchronization doesn't cause a crash.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkFocus.c | 12 |
2 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2009-07-22 Donal K. Fellows <dkf@users.sf.net> + + * generic/tkFocus.c (TkFocusDeadWindow): [Bug 2496114]: Ensure that + focus desynchronization doesn't cause a crash. + 2009-07-20 Donal K. Fellows <dkf@users.sf.net> * tests/clipboard.test (clipboard-6.2): [Bug 2824378]: Corrected diff --git a/generic/tkFocus.c b/generic/tkFocus.c index e524c16..e00c4e2 100644 --- a/generic/tkFocus.c +++ b/generic/tkFocus.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkFocus.c,v 1.16 2007/12/13 15:24:14 dgp Exp $ + * RCS: @(#) $Id: tkFocus.c,v 1.16.2.1 2009/07/22 07:46:42 dkf Exp $ */ #include "tkInt.h" @@ -869,6 +869,16 @@ TkFocusDeadWindow( } } + /* + * Occasionally, things can become unsynchronized. Move them back into + * synch now. [Bug 2496114] + */ + + if (displayFocusPtr->focusWinPtr == winPtr) { + DEBUG(dispPtr, ("focus cleared after %s died\n", winPtr->pathName)); + displayFocusPtr->focusWinPtr = NULL; + } + if (displayFocusPtr->focusOnMapPtr == winPtr) { displayFocusPtr->focusOnMapPtr = NULL; } |