From e186c749ece8b5b688cc7228836b76bd99353289 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 23 Aug 2014 18:29:42 -0700
Subject: [PATCH] fix CatalogLinks race condition

---
 src/General/Header.coffee             | 1 +
 src/Miscellaneous/CatalogLinks.coffee | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index a69967651..541bf697f 100755
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -204,6 +204,7 @@ Header =
           return a
       $.tn t
     $.add list, nodes
+    $.ready CatalogLinks.initBoardList
 
   toggleBoardList: ->
     {bar}  = Header
diff --git a/src/Miscellaneous/CatalogLinks.coffee b/src/Miscellaneous/CatalogLinks.coffee
index 42fa9be83..09f36ed06 100755
--- a/src/Miscellaneous/CatalogLinks.coffee
+++ b/src/Miscellaneous/CatalogLinks.coffee
@@ -12,9 +12,11 @@ CatalogLinks =
       el:    el
       order: 95
 
-    $.on d, '4chanXInitFinished', ->
-      # Set links on load.
-      CatalogLinks.set Conf['Header catalog links']
+  # Set links on load or custom board list change.
+  # Called by Header when both board lists (header and footer) are ready.
+  initBoardList: ->
+    return unless Conf['Catalog Links']
+    CatalogLinks.set Conf['Header catalog links']
 
   toggle: ->
     $.event 'CloseMenu'