From 45adb0a43d0f3b49653b464e69c3d6af2658ae9c Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 12 Nov 2015 15:21:04 +0100 Subject: [PATCH] chat: fix merge #2 --- public/assets/chat/chat.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/chat/chat.coffee b/public/assets/chat/chat.coffee index cb2c68315..4975aceef 100644 --- a/public/assets/chat/chat.coffee +++ b/public/assets/chat/chat.coffee @@ -303,7 +303,7 @@ do($ = window.jQuery, window) -> # delay initial queue position, show connecting first show = => - @onQueue data.position + @onQueue data if @initialQueueDelay && !@onInitialQueueDelayId @onInitialQueueDelayId = setTimeout(show, @initialQueueDelay) return