[Libreoffice-commits] core.git: 2 commits - vcl/generic

[Tor Lillqvist]

 vcl/generic/app/geninst.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ec70e1cb8c162cd1d8adcd459aefbae44cdcd2f8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Oct 29 13:23:24 2013 +0200

    Typo
    
    Change-Id: I564659c8b05f08d497b778144a04464ba8f9ddd6

diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index 4f165e8..c2a6c79 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -117,7 +117,7 @@ bool SalGenericInstance::CheckYieldMutex()
     SalYieldMutex* pYieldMutex = mpSalYieldMutex;
     if ( pYieldMutex->GetThreadId() != osl::Thread::getCurrentIdentifier() )
     {
-        SAL_WARN_IF( pYieldMutex->GetThreadId() != osl::Thread::getCurrentIdentifier(), "sw", "CheckYieldMutex: " << pYieldMutex->GetThreadId() << "!=" << osl::Thread::getCurrentIdentifier() );
+        SAL_WARN_IF( pYieldMutex->GetThreadId() != osl::Thread::getCurrentIdentifier(), "vcl", "CheckYieldMutex: " << pYieldMutex->GetThreadId() << "!=" << osl::Thread::getCurrentIdentifier() );
         bRet = false;
     }
 
commit b67b93bf5b81b8717f80f03ef8dba8b06d7abb54
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Oct 29 13:16:39 2013 +0200

    Add a SAL_WARN_IF to get more verbose information when CheckYieldMutex() fails
    
    Change-Id: Ia9b9e43a25c1d86e3f8c6d9a29d54dd94625bb0d

diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index 22a3975..4f165e8 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -116,7 +116,10 @@ bool SalGenericInstance::CheckYieldMutex()
 
     SalYieldMutex* pYieldMutex = mpSalYieldMutex;
     if ( pYieldMutex->GetThreadId() != osl::Thread::getCurrentIdentifier() )
+    {
+        SAL_WARN_IF( pYieldMutex->GetThreadId() != osl::Thread::getCurrentIdentifier(), "sw", "CheckYieldMutex: " << pYieldMutex->GetThreadId() << "!=" << osl::Thread::getCurrentIdentifier() );
         bRet = false;
+    }
 
     return bRet;
 }