[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/source

[Noel Grandin (via logerrit)]

 vcl/source/window/winproc.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 04fc015bbf14b0b3807678cf4d63a7852508ced1
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jun 14 13:53:51 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Mon Jun 14 20:06:34 2021 +0200

    tdf#142393 crash on filter by color dropdownlist (gen)
    
    the frame/window can become disposed during the early stages of this
    method
    
    Change-Id: I974cbeefa75a3b5274e397a6da70db8b7cf73528
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117157
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 3c0938c9bb63fa65ea44439b4e838ed0d9fa1260)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117124
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 80e306b17625..0504ab4c7df1 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -509,6 +509,8 @@ bool ImplHandleMouseEvent( const VclPtr<vcl::Window>& xWindow, MouseNotifyEvent
                 pMouseDownWin->ImplGetFrameData()->mbStartDragCalled  = true;
         }
 
+        if (xWindow->isDisposed())
+            return true;
         // test for mouseleave and mouseenter
         VclPtr<vcl::Window> pMouseMoveWin = pWinFrameData->mpMouseMoveWin;
         if ( pChild != pMouseMoveWin )