[Libreoffice-commits] online.git: kit/Kit.cpp wsd/DocumentBroker.hpp
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Thu Mar 12 16:08:38 UTC 2020
kit/Kit.cpp | 2 ++
wsd/DocumentBroker.hpp | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 47d22d538ac5c09df6aa098922f8750cb939102b
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Mar 12 15:13:28 2020 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Mar 12 17:08:19 2020 +0100
Fix build for MOBILEAPP
Change-Id: I0903f13438493d167c263020d923536b4de71e5d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90385
Tested-by: Tor Lillqvist <tml at collabora.com>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index f14362c35..f8c76a06a 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2149,12 +2149,14 @@ protected:
LOG_DBG("CreateSession failed.");
}
}
+#if !MOBILEAPP
else if (tokens.equals(0, "exit"))
{
LOG_INF("Terminating immediately due to parent 'exit' command.");
Log::shutdown();
std::_Exit(EX_SOFTWARE);
}
+#endif
else if (tokens.equals(0, "tile") || tokens.equals(0, "tilecombine") || tokens.equals(0, "canceltiles") ||
tokens.equals(0, "paintwindow") || tokens.equals(0, "resizewindow") ||
LOOLProtocol::getFirstToken(tokens[0], '-') == "child")
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 68369d274..7096afd4c 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -108,6 +108,7 @@ public:
try
{
+#if !MOBILEAPP // There is no "child process" in a mobile app
LOG_DBG("Closing ChildProcess [" << _pid << "].");
// Request the child to exit
@@ -116,7 +117,7 @@ public:
LOG_DBG("Stopping ChildProcess [" << _pid << "] by sending 'exit' command.");
sendTextFrame("exit");
}
-
+#endif
// Shutdown the socket.
if (_ws)
_ws->shutdown();
More information about the Libreoffice-commits
mailing list