summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2020-03-25 14:08:14 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2020-03-25 16:25:43 +0100
commit4af18ebae9d74b43fcd114d5fa5b145586651bc2 (patch)
tree564d63c61a6299f85f05b6e83975b01eae9b46cd /vcl
parent35d3d6bb3b3795653fb4210b751a8e9f0183f741 (diff)
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@cib.de>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/window2.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 01d224f55057..c2c40b7713ff 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1346,8 +1346,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);
}
}