diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-11 11:36:40 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-09-15 09:55:43 +0200 |
| commit | 8abebbba4b3597190d1023cb93c17983d9cb5c99 (patch) | |
| tree | 8149b5804d833a0487ea5529190a6e0f59b100df /vcl | |
| parent | 451894d5bfdc2846740246e74b819659309f14a5 (diff) | |
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/+/102423
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/vclevent.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index b99a56a4fc0c..3dfad4a4ca78 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -50,7 +50,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 |