From f0e2bce4ef09b96388123588a5349490a93016a2 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Thu, 1 Jan 2015 22:45:20 -0800
Subject: [PATCH] Redirect native catalog searches to index search. #239, #247

---
 src/General/Main.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index e5a4240d3..c887aa287 100755
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -66,7 +66,8 @@ Main =
         return
 
     if Conf['JSON Navigation'] and Conf['Use 4chan X Catalog'] and g.VIEW is 'catalog'
-      location.replace "//boards.4chan.org/#{g.BOARD}/#catalog"
+      search = location.href.match /#s=.*/
+      location.replace "//boards.4chan.org/#{g.BOARD}/#{if search then search[0] else '#catalog'}"
       return
 
     if Conf['Normalize URL'] and g.VIEW is 'thread'