Merge branch 'master' into webpack-frontend

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/ot/editor-socketio-server.js b/lib/ot/editor-socketio-server.js
index 45ed5036..d062fa19 100755
--- a/lib/ot/editor-socketio-server.js
+++ b/lib/ot/editor-socketio-server.js
@@ -55,7 +55,15 @@ EditorSocketIOServer.prototype.addClient = function (socket) {
                 if (typeof self.operationCallback === 'function')
                     self.operationCallback(socket, operation);
             } catch (err) {
-				socket.disconnect(true);
+                setTimeout(function() {
+                    var docOut = {
+                        str: self.document,
+                        revision: self.operations.length,
+                        clients: self.users,
+                        force: true
+                    };
+                    socket.emit('doc', LZString.compressToUTF16(JSON.stringify(docOut)));
+                }, 100);
             }
         });
     });