From bad920e28dc2a1ae609e44574ee5bc51900979e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= <mba@fourplusone.de>
Date: Thu, 16 Feb 2012 23:11:52 +0100
Subject: [PATCH] fixes #417 and #360

---
 node/handler/PadMessageHandler.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/node/handler/PadMessageHandler.js b/node/handler/PadMessageHandler.js
index 19aa1f9b2..c7cffaa3f 100644
--- a/node/handler/PadMessageHandler.js
+++ b/node/handler/PadMessageHandler.js
@@ -859,6 +859,10 @@ function handleClientReady(client, message)
           //get the authorname & colorId
           function(callback)
           {
+            if(sessioninfos[sessionID] === undefined){
+               callback();
+               return;
+            }
             async.parallel([
               function(callback)
               {
@@ -883,7 +887,7 @@ function handleClientReady(client, message)
           function (callback)
           {
             //Jump over, if this session is the connection session
-            if(sessionID != client.id)
+            if(sessionID != client.id && socketio.sockets.sockets[sessionID] !== undefined)
             {
               //Send this Session the Notification about the new user
               socketio.sockets.sockets[sessionID].json.send(messageToTheOtherUsers);