[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp

[Henry Castro]

 loolwsd/LOOLWSD.cpp |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 161e5534ec3669e50662687769ba02aba6cfaf70
Author: Henry Castro <hcastro at collabora.com>
Date:   Fri Jul 17 21:54:26 2015 -0400

    loolwsd: mutex lock when loKit initialization.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index ec7288f..9af4aad 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -726,9 +726,7 @@ void LOOLWSD::componentMain()
 {
     try
     {
-
-        // initialisation
-        //_childId = Process::id();
+        namedMutexLOOL.lock();
 
 #ifdef __APPLE__
         LibreOfficeKit *loKit(lok_init_2(("/" + loSubPath + "/Frameworks").c_str(), "file:///user"));
@@ -742,8 +740,6 @@ void LOOLWSD::componentMain()
             exit(Application::EXIT_UNAVAILABLE);
         }
 
-        // wait until desktop sockets setup
-        namedMutexLOOL.lock();
         namedMutexLOOL.unlock();
 
         // Open websocket connection between the child process and the