[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loolwsd/LOOLSession.cpp

[Henry Castro]

 loolwsd/LOOLSession.cpp |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit d8f20fee5ba91dd47470312007735534065b5213
Author: Henry Castro <hcastro at collabora.com>
Date:   Fri Jan 15 11:39:43 2016 -0400

    loolwsd: close client websocket when abnormal close prison websocket

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 5e11e1d..430e9fa 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -197,6 +197,11 @@ MasterProcessSession::~MasterProcessSession()
     {
         Util::shutdownWebSocket(*(peer->_ws));
     }
+    else
+    if (_kind == Kind::ToPrisoner && peer)
+    {
+        Util::shutdownWebSocket(*(peer->_ws));
+    }
 }
 
 bool MasterProcessSession::handleInput(const char *buffer, int length)