loolwsd/LOOLBroker.cpp | 2 +- loolwsd/LOOLWSD.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 5848cff63409f6d708d562e2c702425f65647d7a Author: Henry Castro <hcas...@collabora.com> Date: Wed Feb 3 19:51:27 2016 -0400 loolwsd: wait for loolbroker process to change state diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp index 858009f..41305d6 100644 --- a/loolwsd/LOOLBroker.cpp +++ b/loolwsd/LOOLBroker.cpp @@ -965,7 +965,7 @@ int main(int argc, char** argv) else if (WIFSIGNALED(status)) { - nChildExitCode = Util::getSignalStatus(WEXITSTATUS(status)); + nChildExitCode = Util::getSignalStatus(WTERMSIG(status)); std::string fate = "died"; #ifdef WCOREDUMP if (WCOREDUMP(status)) diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index eeb3d2d..02482d9 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -1000,7 +1000,7 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/) unsigned timeoutCounter = 0; while (!TerminationFlag && !LOOLWSD::DoTest) { - const pid_t pid = waitpid(-1, &status, WUNTRACED | WNOHANG); + const pid_t pid = waitpid(pidBroker, &status, WUNTRACED | WNOHANG); if (pid > 0) { if (pidBroker == pid) @@ -1084,7 +1084,7 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/) Process::requestTermination(pidBroker); // wait broker process finish - waitpid(-1, &status, WUNTRACED); + waitpid(pidBroker, &status, WUNTRACED); close(BrokerWritePipe); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits