From d05244742f047b5803fd3545beed334c95acf4bc Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Fri, 19 Nov 1999 19:50:49 +0000 Subject: [PATCH] Fri Nov 19 16:34:16 EST 1999 (Christian) Fixed a segfault that Paul Radford reported: "Minimize a window into an iconbox, close the icon- box and minimize the app again". I could not exactly reproduce this because I already got segfaults when I _entered_ the window that is uniconified when the iconbox is closed. In any case, there were strange things going on with mode.focuswin, because FocusToEWin(NULL) returns immediately in clickmode ... hope the whole thing is history now. SVN revision: 1337 --- src/ChangeLog | 15 +++++++++++++++ src/borders.c | 6 ++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3b490988..9636a659 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -3965,3 +3965,18 @@ Mon Nov 15 14:53:40 PST 1999 fixed an uninitialized memory check in menus.c (reported by Alan Stange - this man is getting it on with debuggers - I will put his name in the credits sometime this week for 0.16.3) + +------------------------------------------------------------------------------- + +Fri Nov 19 16:34:16 EST 1999 +(Christian) + +Fixed a segfault that Paul Radford +reported: "Minimize a window into an iconbox, close the icon- +box and minimize the app again". I could not exactly reproduce +this because I already got segfaults when I _entered_ the window +that is uniconified when the iconbox is closed. + +In any case, there were strange things going on with +mode.focuswin, because FocusToEWin(NULL) returns immediately +in clickmode ... hope the whole thing is history now. diff --git a/src/borders.c b/src/borders.c index 2f7af767..72b0c578 100644 --- a/src/borders.c +++ b/src/borders.c @@ -1596,6 +1596,10 @@ FreeEwin(EWin * ewin) HideMenuMasker(); } } + + if (ewin == mode.focuswin) + FocusToNone(); + if (ewin->pager) PagerKill(ewin->pager); if (ewin->ibox) @@ -1608,8 +1612,6 @@ FreeEwin(EWin * ewin) if (mode.kde_support) KDE_RemoveWindow(ewin); - if (ewin == mode.focuswin) - FocusToEWin(NULL); if (ewin->client.transient) { ewin2 = FindItem(NULL, ewin->client.transient_for, LIST_FINDBY_ID,