[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a12b8566e835badeae449c52dbace21efc5e623e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 22 12:24:01 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 22 20:35:15 2020 +0200

    Resolves: tdf#133269 infinite regress
    
    Change-Id: Iffd7306517ceca94eb6db5360c7d5069c8958acc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94664
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 31d4d8dbb1f5..d372391fec2a 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -4512,9 +4512,10 @@ bool GtkSalFrame::CallCallbackExc(SalEvent nEvent, const void* pEvent) const
 
 void GtkSalFrame::nopaint_container_resize_children(GtkContainer *pContainer)
 {
+    bool bOrigSalObjectSetPosSize = m_bSalObjectSetPosSize;
     m_bSalObjectSetPosSize = true;
     gtk_container_resize_children(pContainer);
-    m_bSalObjectSetPosSize = false;
+    m_bSalObjectSetPosSize = bOrigSalObjectSetPosSize;
 }
 
 GdkEvent* GtkSalFrame::makeFakeKeyPress(GtkWidget* pWidget)