diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-07 16:11:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-07 19:48:02 +0100 |
| commit | 2d06773762cae7d1cc98c723815a65b457a642c8 (patch) | |
| tree | c2a496918584afa1ac8de937fe747b2b4274088d /vcl/source/window/winproc.cxx | |
| parent | 4c9d7772bd76c30ddbfb7e0b3460aabb9529cfde (diff) | |
replace some IsDead with isDisposed
keep both tests for now for cowardice
Change-Id: I96d922ef64b874f2124204c3c564a38fa7511ffe
Diffstat (limited to 'vcl/source/window/winproc.cxx')
| -rw-r--r-- | vcl/source/window/winproc.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index dbe7b91ae7fe..5d73c49bbb14 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -739,11 +739,13 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool } } - if ( !aDelData.IsDead() ) - aNEvt.GetWindow()->ImplNotifyKeyMouseCommandEventListeners( aNEvt ); + assert(aNEvt.GetWindow() == pChild); + + if (!pChild->isDisposed() || !aDelData.IsDead()) + pChild->ImplNotifyKeyMouseCommandEventListeners( aNEvt ); } - if ( aDelData.IsDead() ) + if (pChild->isDisposed() || aDelData.IsDead()) return true; if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE ) |