[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Mon Nov 4 14:25:19 UTC 2019
wsd/LOOLWSD.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 36b126c745e1e9a4286d43c0fd9688598cffddad
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Nov 4 15:21:44 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 4 15:25:01 2019 +0100
Fix build for MOBILEAPP
Change-Id: I410359a8f2e6cda6e0857d370a3b18db68b619e2
Reviewed-on: https://gerrit.libreoffice.org/82013
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 0a66ac719..90d0394df 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3503,13 +3503,14 @@ int LOOLWSD::innerMain()
// atexit handlers tend to free Admin before Documents
LOG_INF("Exiting. Cleaning up lingering documents.");
+#ifndef MOBILEAPP
if (!SigUtil::getShutdownRequestFlag())
{
// This shouldn't happen, but it's fail safe to always cleanup properly.
LOG_WRN("Exiting WSD without ShutdownRequestFlag. Setting it now.");
SigUtil::requestShutdown();
}
-
+#endif
// Don't stop the DocBroker, they will exit.
constexpr size_t sleepMs = 500;
constexpr size_t count = (COMMAND_TIMEOUT_MS * 4) / sleepMs;
More information about the Libreoffice-commits
mailing list