summaryrefslogtreecommitdiff
path: root/src/node/handler/PadMessageHandler.js
diff options
context:
space:
mode:
authorGared <mu.stefan@googlemail.com>2014-12-27 22:25:24 +0100
committerGared <mu.stefan@googlemail.com>2014-12-27 22:25:24 +0100
commit9cf19b99feaa9500a7805bdc63bad1cb022f981b (patch)
treefec1c1f539efbfa3a12297655e1cb5286d5dd46c /src/node/handler/PadMessageHandler.js
parenta645aeef5c46f631619669111c9dfb368c7fb0b7 (diff)
downloadetherpad-lite-9cf19b99feaa9500a7805bdc63bad1cb022f981b.zip
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
Diffstat (limited to 'src/node/handler/PadMessageHandler.js')
-rw-r--r--src/node/handler/PadMessageHandler.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index 7cdefc65..5c8f9131 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -1020,7 +1020,12 @@ function handleClientReady(client, message)
{
authorManager.getAuthor(authorId, function(err, author)
{
- if(ERR(err, callback) || !author) return;
+ if(!author && !err)
+ {
+ messageLogger.error("There is no author for authorId:", authorId);
+ return callback();
+ }
+ if(ERR(err, callback)) return;
historicalAuthorData[authorId] = {name: author.name, colorId: author.colorId}; // Filter author attribs (e.g. don't send author's pads to all clients)
callback();
});