[Libreoffice-commits] online.git: loolwsd/ChildSession.cpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Wed Jul 27 15:54:58 UTC 2016


 loolwsd/ChildSession.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92d36a57913c45fe3b71fa4e6c4f8f4635269cf1
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Jul 24 22:50:26 2016 -0400

    loolwsd: loKitDocument might be invalid
    
    Check for valid loKitDocument instance when
    using it in ChildSession dtor.
    
    Change-Id: I1e883d0f1bbe530bf3055a2d0833be2d38ef253c
    Reviewed-on: https://gerrit.libreoffice.org/27584
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp
index 6b562dc..faf8c89 100644
--- a/loolwsd/ChildSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -327,7 +327,7 @@ void ChildSession::disconnect()
     {
         std::unique_lock<std::recursive_mutex> lock(Mutex);
 
-        if (_multiView)
+        if (_multiView && _loKitDocument)
             _loKitDocument->setView(_viewId);
 
         _onUnload(getId());


More information about the Libreoffice-commits mailing list