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

[Caolán McNamara (via logerrit)]

 vcl/source/window/window2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d38c5abbb0a34159fc13ef86269fbff3a93c3109
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Apr 27 11:16:33 2021 +0100
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Fri Apr 30 11:03:41 2021 +0200

    tdf#141854 Resize called during dispose
    
    Change-Id: Ie5eaafa95704f9567b8bb9881865571a39bb2f6b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114708
    Tested-by: Jenkins
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit aea139c440d7c7a3683fcbbc48799bc79ba590e7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114860
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index a729f655a93d..75885cb43d98 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1348,7 +1348,7 @@ void Window::queue_resize(StateChangedType eReason)
         }
     }
 
-    if (bSomeoneCares && !mpWindowImpl->mbInDispose)
+    if (bSomeoneCares && !isDisposed())
     {
         //fdo#57090 force a resync of the borders of the borderwindow onto this
         //window in case they have changed