Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Pita/etherpad-lite
Browse files Browse the repository at this point in the history
  • Loading branch information
Pita committed Jan 22, 2012
2 parents cece2c8 + 165f269 commit cf47153
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions node/handler/PadMessageHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,12 @@ exports.updatePadClients = function(pad, callback)
], function(err)
{
if(ERR(err, callback)) return;

// next if session has not been deleted
if(sessioninfos[session] == null)
{
callback(null);
return;
}
if(author == sessioninfos[session].author)
{
socketio.sockets.sockets[session].json.send({"type":"COLLABROOM","data":{type:"ACCEPT_COMMIT", newRev:r}});
Expand All @@ -538,7 +543,10 @@ exports.updatePadClients = function(pad, callback)
callback
);

sessioninfos[session].rev = pad.getHeadRevisionNumber();
if(sessioninfos[session] != null)
{
sessioninfos[session].rev = pad.getHeadRevisionNumber();
}
},callback);
}

Expand Down

0 comments on commit cf47153

Please sign in to comment.