[Libreoffice-commits] .: vcl/unx

David Tardon dtardon at kemper.freedesktop.org
Fri Jun 10 04:59:58 PDT 2011


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

New commits:
commit 56521d32031fbb5b80d9c5ad783eb8220b7ad28f
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Jun 10 13:58:34 2011 +0200

    helgrind: Thread #1 unlocked a not-locked lock

diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 300bd7e..4783483 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -794,6 +794,9 @@ void ICEConnectionObserver::ICEWatchProc(
             close( nWakeupFiles[1] );
             close( nWakeupFiles[0] );
             ICEThread = NULL;
+            // acquire the mutex again, because the caller does not expect
+            // it to be released when calling into SM
+            osl_acquireMutex( ICEMutex );
         }
     }
     SMprintf( "ICE connection on %d %s\n",


More information about the Libreoffice-commits mailing list