[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/docvw/PageBreakWin.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5b7ceed80f2943cd85bb70d19bc482fd2e712386
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 29 20:06:33 2022 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Aug 30 08:46:56 2022 +0200

    Resolves: tdf#150629 the window was destroyed from the fadetimer callback
    
    which is how it could be possible that SwPageBreakWin::dispose() could
    be both called, stopping the timer, but the timer callback could access
    the disposed SwPageBreakWin
    
    Change-Id: If29ffb45fbde607d35c12064b05e4b5d25c2f009
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138975
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx 
b/sw/source/uibase/docvw/PageBreakWin.cxx
index fe68dd1673a2..600d23a4489d 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -486,6 +486,7 @@ IMPL_LINK_NOARG(SwPageBreakWin, FadeHandler, Timer *, void)
     {
         Hide();
         m_pLine->DestroyWin();
+        return;
     }
     else
     {