[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp
Jan Holesovsky
kendy at collabora.com
Wed Feb 8 22:28:34 UTC 2017
wsd/LOOLWSD.cpp | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit c49e810437b0a6748807a82597647ddba6fa6a17
Author: Jan Holesovsky <kendy at collabora.com>
Date: Wed Feb 8 22:57:50 2017 +0100
Avoid crash on exit with trace file disabled.
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 24255df..3f719cb 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2007,6 +2007,8 @@ void LOOLWSD::dumpNewSessionTrace(const std::string& id, const std::string& sess
void LOOLWSD::dumpEndSessionTrace(const std::string& id, const std::string& sessionId, const std::string& uri)
{
+ if (TraceDumper)
+ {
try
{
TraceDumper->endSession(id, sessionId, uri);
@@ -2015,6 +2017,7 @@ void LOOLWSD::dumpEndSessionTrace(const std::string& id, const std::string& sess
{
LOG_WRN("Exception in tracer newSession: " << exc.what());
}
+ }
}
void LOOLWSD::dumpEventTrace(const std::string& id, const std::string& sessionId, const std::string& data)
More information about the Libreoffice-commits
mailing list