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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 1 19:16:37 UTC 2021


 vcl/unx/gtk3/gtkinst.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit c3858276077d5b1941d2645919c2a6e583c6052a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jun 1 13:20:43 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 1 21:15:56 2021 +0200

    flatten function a little
    
    Change-Id: Iae4d7cbb3722716d18f50e6b0979cdf5fea9fd45
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116549
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index f1d81f7d27a1..f6f46acdb0df 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -339,14 +339,14 @@ thread_local std::stack<sal_uInt32> GtkYieldMutex::yieldCounts;
 void GtkYieldMutex::ThreadsEnter()
 {
     acquire();
-    if (!yieldCounts.empty()) {
-        auto n = yieldCounts.top();
-        yieldCounts.pop();
-        assert(n > 0);
-        n--;
-        if (n > 0)
-            acquire(n);
-    }
+    if (yieldCounts.empty())
+        return;
+    auto n = yieldCounts.top();
+    yieldCounts.pop();
+    assert(n > 0);
+    n--;
+    if (n > 0)
+        acquire(n);
 }
 
 void GtkYieldMutex::ThreadsLeave()


More information about the Libreoffice-commits mailing list