diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-29 20:58:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-30 16:04:59 +0200 |
| commit | f781691a6e35923acf64e11e082c4173fcf9d5e6 (patch) | |
| tree | 72d772968155445920e828fb47f0eff8788d7472 | |
| parent | ea1daffc097025c9969f76119d3864cbef203c34 (diff) | |
tdf#142549 Assertion failure when closing LO in gtk a11y
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 <noel.grandin@collabora.co.uk>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/app/vclevent.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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<VclWindowEvent*>(&rEvent)) { VclPtr<vcl::Window> 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<VclSimpleEvent&,void> &rLink = *aIter; // check this hasn't been removed in some re-enterancy scenario fdo#47368 |