loolwsd/ChildSession.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 2744caf97b4c1be26966d04e61518022f9f546a9
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Fri Aug 12 09:42:31 2016 -0400
loolwsd: simplify status after load
Change-Id: I919e09616173d88eda8989e06da05ae54c0bdda0
Reviewed-on: https://gerrit.libreoffice.org/28119
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp
index 4cc4eb9..f70348d 100644
--- a/loolwsd/ChildSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -639,8 +639,12 @@ bool ChildSession::loadDocument(const char * /*buffer*/,
int /*length*/, StringT
// Respond by the document status, which has no arguments.
Log::debug("Sending status after loading view " + std::to_string(_viewId)
+ ".");
- if (!getStatus(nullptr, 0))
+ const auto status = LOKitHelper::documentStatus(_loKitDocument->get());
+ if (status.empty() || !sendTextFrame("status: " + status))
+ {
+ Log::error("Failed to get/forward document status [" + status + "].");
return false;
+ }
Log::info("Loaded session " + getId());
return true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
