[Libreoffice-commits] online.git: kit/Kit.cpp
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Tue Oct 8 12:08:44 UTC 2019
kit/Kit.cpp | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit e51d0a642d34e00e1167ca1a8c94395beead46ef
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Oct 8 14:49:35 2019 +0300
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Oct 8 14:08:23 2019 +0200
Fix build for MOBILEAPP where we don't have Log::shutdown()
(Because a mobile app is not supposed to ever exit voluntarily and
cleanly anyway.)
Perhaps we should call abort() in thse cases, though, and not just
continue as if nothing is wrong?
Change-Id: Iceb10cc767522c1fee587624ea6e810c62586207
Reviewed-on: https://gerrit.libreoffice.org/80446
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Tested-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index fbe42a7f1..b40577878 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2115,14 +2115,18 @@ public:
catch (const std::exception& exc)
{
LOG_FTL("QueueHandler::run: Exception: " << exc.what());
+#if !MOBILEAPP
Log::shutdown();
std::_Exit(Application::EXIT_SOFTWARE);
+#endif
}
catch (...)
{
LOG_FTL("QueueHandler::run: Unknown exception");
+#if !MOBILEAPP
Log::shutdown();
std::_Exit(Application::EXIT_SOFTWARE);
+#endif
}
}
More information about the Libreoffice-commits
mailing list