diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-03-12 15:13:28 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-03-12 17:08:19 +0100 |
| commit | 47d22d538ac5c09df6aa098922f8750cb939102b (patch) | |
| tree | 85d266557ad32c875663390c18f4bc867a7f981a | |
| parent | tdf#130594: leaflet: Search bar issues (diff) | |
| download | online-47d22d538ac5c09df6aa098922f8750cb939102b.tar.gz online-47d22d538ac5c09df6aa098922f8750cb939102b.zip | |
Fix build for MOBILEAPP
Change-Id: I0903f13438493d167c263020d923536b4de71e5d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90385
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | kit/Kit.cpp | 2 | ||||
| -rw-r--r-- | wsd/DocumentBroker.hpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/kit/Kit.cpp b/kit/Kit.cpp index f14362c355..f8c76a06a6 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 68369d274d..7096afd4cd 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(); |