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

Henry Castro hcastro at collabora.com
Wed Jul 15 06:21:36 PDT 2015


 loolwsd/LOOLWSD.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3f3b9f767581ac629c941f4c15f4da9eaae650ed
Author: Henry Castro <hcastro at collabora.com>
Date:   Wed Jul 15 09:15:12 2015 -0400

    loolwsd: remove WSTOPSIG(status).
    
    No child returns status process stop. This cause problems
    when we attach one child to debug.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 61fe7a6..77be226 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1052,7 +1052,7 @@ void LOOLWSD::desktopMain()
             MasterProcessSession::_childProcesses.find(pid) != MasterProcessSession::_childProcesses.end())
             std::cout << Util::logPrefix() << "One of our known child processes died" << std::endl;
 
-        if (WSTOPSIG(status) && MasterProcessSession::getAvailableChildSessions() == 0 && MasterProcessSession::getPendingPreSpawnedChildren() == 0 )
+        if (MasterProcessSession::getAvailableChildSessions() == 0 && MasterProcessSession::getPendingPreSpawnedChildren() == 0 )
         {
             std::cout << Util::logPrefix() << "No availabe child session, fork new one" << std::endl;
             if (createComponent() < 0 )


More information about the Libreoffice-commits mailing list