vcl/source/app/vclevent.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit a419780b39b1dc875db4ed4a45f6b338524e7c82 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Fri Sep 11 11:36:40 2020 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Fri Sep 11 14:04:00 2020 +0200 application level settings-changed event callbacks not triggering this was originally... ImplDelData aDel( pWinEvent->GetWindow() ); while ( aIter != aEnd && !aDel.IsDead() ) before commit 1db7af8bc9febdf72138fac533ec81d6983da729 Date: Tue Jan 26 22:10:52 2016 +0530 tdf#96888 - Kill internal vcl dog-tags ... back then if GetWindow was null ImplDelData.IsDead() was always false Change-Id: I1e75c27635532afa08ed43bf92bda35b34ae6320 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102455 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index 94cf37c638d3..1895051ce633 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -35,7 +35,7 @@ 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() ) + while ( aIter != aEnd && (!xWin || !xWin->IsDisposed()) ) { Link<VclSimpleEvent&,void> &rLink = *aIter; // check this hasn't been removed in some re-enterancy scenario fdo#47368 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits