Fix for #302 (autoscroll broken on Chrome)

diff --git a/AUTHORS b/AUTHORS
index 47f7da0fbf31d80ace82596bf08359975c617332..eb8598299528301fdc8dfad94cafd4d2c74205bc 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,4 +7,4 @@ Bas Verhoeven (soczol) <bas@bserved.nl>
 Tom Wesley (tomaw) <tom@tomaw.org>
 Jason Hill (SecretAgent) <secrtagnt@gmail.com>
 anarcat
-
+Copy Chaplin <<elephantman@europnet.org>

diff --git a/js/ui/baseuiwindow.js b/js/ui/baseuiwindow.js
index 1802c03328c8b2defe6b7837828735b884f0c1bd..5369d1a63a97b6fc42e2b2542d756c9c69c5b333 100644 (file)
--- a/js/ui/baseuiwindow.js
+++ b/js/ui/baseuiwindow.js
@@ -195,6 +195,9 @@ qwebirc.ui.Window = new Class({
         if(this.scrolltimer)
           $clear(this.scrolltimer);
         this.scrolltimer = this.scrollAdd.delay(50, this, [null]);
+      } else {
+        this.scrollToBottom();
+        this.scrolltimer = null;
       }
     } else {
       this.scrollToBottom();