summaryrefslogtreecommitdiff
path: root/vcl/source/app
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-09-11 11:36:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-09-11 14:04:00 +0200
commita419780b39b1dc875db4ed4a45f6b338524e7c82 (patch)
tree1e3fa805baf534c33c2bf2c143e69bba84a37f26 /vcl/source/app
parent3b918495513d8e43063a45ac500962703e08f94e (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/+/102455 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/app')
-rw-r--r--vcl/source/app/vclevent.cxx2
1 files changed, 1 insertions, 1 deletions
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