From fc56c68ece6c648debd4f7645036d60993ef1a1d Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Tue, 17 Feb 2015 23:57:49 -0800
Subject: [PATCH] Header settings should be ignored when 'Fixed Header' is
 turned off. #327

---
 src/General/Header.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index 16ed34856..1b18dc826 100755
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -428,7 +428,7 @@ Header =
   scrollTo: (root, down, needed) ->
     if down
       x = Header.getBottomOf root
-      if Conf['Header auto-hide on scroll'] and Conf['Bottom header']
+      if Conf['Fixed Header'] and Conf['Header auto-hide on scroll'] and Conf['Bottom header']
         {height} = Header.bar.getBoundingClientRect()
         if x <= 0
           x += height if !Header.isHidden()
@@ -437,7 +437,7 @@ Header =
       window.scrollBy 0, -x unless needed and x >= 0
     else
       x = Header.getTopOf root
-      if Conf['Header auto-hide on scroll'] and !Conf['Bottom header']
+      if Conf['Fixed Header'] and Conf['Header auto-hide on scroll'] and !Conf['Bottom header']
         {height} = Header.bar.getBoundingClientRect()
         if x >= 0
           x += height if !Header.isHidden()
@@ -458,7 +458,7 @@ Header =
   getBottomOf: (root) ->
     {clientHeight} = doc
     bottom = clientHeight - root.getBoundingClientRect().bottom
-    if Conf['Bottom Header']
+    if Conf['Fixed Header'] and Conf['Bottom Header']
       headRect = Header.toggle.getBoundingClientRect()
       bottom  -= clientHeight - headRect.bottom + headRect.height
     bottom