From edac93859ba8b6446dce08b0cffb9def3d9ff182 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 12 Apr 2016 14:42:43 +0200
Subject: vcl: simplify WNT SalYieldMutex::release() a bit

The ordering between clearing mnThreadId and OpenGLContext shouldn't
matter since it was already inconsistent.

Change-Id: I0b7b6457547e9e38527de58ba062fd7092178056
---
 vcl/win/app/salinst.cxx | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'vcl')

diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index f47e5d86e406..d55fa70921e0 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -147,25 +147,20 @@ void SalYieldMutex::release()
         m_mutex.release();
     else
     {
-        bool isRelease(1 == mnCount);
+        bool const isRelease(1 == mnCount);
         if ( isRelease )
         {
+            OpenGLContext::prepareForYield();
+
             SalData* pSalData = GetSalData();
             if ( pSalData->mnAppThreadId != nThreadId )
             {
-                OpenGLContext::prepareForYield();
-
                 // If we don't call these message, the Output from the
                 // Java clients doesn't come in the right order
                 GdiFlush();
 
-                mnThreadId = 0;
-            }
-            else
-            {
-                mnThreadId = 0;
-                OpenGLContext::prepareForYield();
             }
+            mnThreadId = 0;
         }
 
         mnCount--;
-- 
cgit