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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 869ef9f2118158222032964a5b24ae7d760b84e9
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Jul 30 20:20:44 2020 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jul 31 11:28:24 2020 +0200

    tdf#135317 avoid reenterence
    
    Change-Id: I79b6c1c2a2503c49a94f6c7ed74286f53ccebd44
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99821
    Tested-by: Jenkins
    Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index a6e6901c0604..658c09ab756d 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -12225,6 +12225,7 @@ private:
     gulong m_nOutputSignalId;
     gulong m_nInputSignalId;
     bool m_bEmptyField;
+    bool m_bSyncingValue;
     double m_dValueWhenEmpty;
 
     bool signal_output()
@@ -12285,6 +12286,7 @@ public:
         , m_nOutputSignalId(g_signal_connect(pButton, "output", 
G_CALLBACK(signalOutput), this))
         , m_nInputSignalId(g_signal_connect(pButton, "input", 
G_CALLBACK(signalInput), this))
         , m_bEmptyField(false)
+        , m_bSyncingValue(false)
         , m_dValueWhenEmpty(0.0)
     {
     }
@@ -12359,9 +12361,14 @@ public:
     {
         if (!m_pFormatter)
             return;
+        // tdf#135317 avoid reenterence
+        if (m_bSyncingValue)
+            return;
+        m_bSyncingValue = true;
         disable_notify_events();
         gtk_spin_button_set_value(m_pButton, m_pFormatter->GetValue());
         enable_notify_events();
+        m_bSyncingValue = false;
     }
 
     virtual void sync_range_from_formatter() override
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits