From 1a37ea60d555b5ff880938e379591386d2578f2e Mon Sep 17 00:00:00 2001 From: dkf Date: Wed, 22 Jul 2009 07:46:42 +0000 Subject: [Bug 2496114]: Ensure that focus desynchronization doesn't cause a crash. --- ChangeLog | 5 +++++ generic/tkFocus.c | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 626800a..f25103b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-07-22 Donal K. Fellows + + * generic/tkFocus.c (TkFocusDeadWindow): [Bug 2496114]: Ensure that + focus desynchronization doesn't cause a crash. + 2009-07-20 Donal K. Fellows * 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; } -- cgit v0.12