[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source

[Samuel Mehrbrodt (via logerrit)]

 vcl/source/window/window2.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 61a35560cb412d7ab0e3d0574eec4a790e3b9dfd
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Wed Mar 25 14:08:14 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun May 10 21:50:55 2020 +0200

    tdf#131280 Fix endless invalidation loop on documents with form controls
    
    Restores a condition which was removed in 8de98e61fbc96bf523b3dec7e1e52eb7e2d7693e
    
    Change-Id: I68a9f8a362d2ded9975e7c73e2a0533aa5ad9e94
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91053
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93867
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 8092b1a12aba..5539fb3b8463 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1354,8 +1354,8 @@ void Window::queue_resize(StateChangedType eReason)
     if (VclPtr<vcl::Window> pParent = GetParentWithLOKNotifier())
     {
         Size aSize = GetSizePixel();
-        if (aSize.getWidth() > 0 && aSize.getHeight() > 0 &&
-            !pParent->IsInInitShow())
+        if (aSize.getWidth() > 0 && aSize.getHeight() > 0 && GetParentDialog()
+            && !pParent->IsInInitShow())
             LogicInvalidate(nullptr);
     }
 }