[Libreoffice-commits] online.git: Branch 'private/hcvcastro/forking' - loolwsd/LOOLBroker.cpp
Henry Castro
hcastro at collabora.com
Mon Aug 17 16:06:05 PDT 2015
loolwsd/LOOLBroker.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7d1bceb85f5157daaec054e847a005ddab1ec2c9
Author: Henry Castro <hcastro at collabora.com>
Date: Mon Aug 17 19:04:28 2015 -0400
loolwsd: move globlaPreinit after chroot
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 6f0c038..31577ff 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -371,8 +371,6 @@ int main(int argc, char** argv)
exit(1);
}
- bool sharePages = globalPreinit(loSubPath);
-
std::unique_lock<std::mutex> rngLock(_rngMutex);
Poco::UInt64 _childId = (((Poco::UInt64)_rng.next()) << 32) | _rng.next() | 1;
rngLock.unlock();
@@ -439,6 +437,8 @@ int main(int argc, char** argv)
dropCapability();
#endif
+ bool sharePages = globalPreinit(loSubPath);
+
startupLibreOfficeKit(sharePages, _numPreSpawnedChildren, loSubPath, _childId);
while (_childProcesses.size() > 0)
More information about the Libreoffice-commits
mailing list