From f781691a6e35923acf64e11e082c4173fcf9d5e6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 29 May 2021 20:58:30 +0100 Subject: tdf#142549 Assertion failure when closing LO in gtk a11y MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit since... commit d90aa314961ea4a6893144cd6be66dd71cc2cca1 Date: Fri May 28 20:39:00 2021 +0200 IsDisposed->isDisposed in vcl/../app revert the offending hunk for now. maybe final fix is to special case VclEventId::ObjectDying or convert to !xWin->mpWindowImpl or something. Change-Id: I6987aeb753181fa2eb705fa0535c092e51587a9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116396 Reviewed-by: Noel Grandin Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/source/app/vclevent.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index 7da46dbb19ec..8d2142fa4821 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -35,7 +35,9 @@ void VclEventListeners::Call( VclSimpleEvent& rEvent ) const if (VclWindowEvent* pWindowEvent = dynamic_cast(&rEvent)) { VclPtr xWin(pWindowEvent->GetWindow()); - while ( aIter != aEnd && (!xWin || !xWin->isDisposed()) ) + // see tdf#142549 before changing IsDisposed() to isDisposed(), maybe !xWin->mpWindowImpl + // or special case VclEventId::ObjectDying ? + while ( aIter != aEnd && (!xWin || !xWin->IsDisposed()) ) { Link &rLink = *aIter; // check this hasn't been removed in some re-enterancy scenario fdo#47368 -- cgit