From e827b63336b72bd7c37f68759861984eeff7ef4f Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Fri, 1 Jul 2016 00:05:27 -0700
Subject: [PATCH] Set 'Persistent Thread Watcher' to inverse of old 'Toggleable
 Thread Watcher' setting.

Per discussion in #983.
---
 src/General/Settings.coffee         | 3 +++
 src/Monitoring/ThreadWatcher.coffee | 2 +-
 src/config/Config.coffee            | 2 +-
 src/main/Main.coffee                | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee
index 71aad1826..c33fd000c 100644
--- a/src/General/Settings.coffee
+++ b/src/General/Settings.coffee
@@ -393,6 +393,9 @@ Settings =
     if compareString < '00001.00012.00000.00006'
       if data['sauces']?
         set 'sauces', data['sauces'].replace(/^(#?\s*)https:\/\/(?:desustorage|cuckchan)\.org\//mg, '$1https://desuarchive.org/')
+    if compareString < '00001.00012.00001.00000'
+      if not data['Persistent Thread Watcher']? and data['Toggleable Thread Watcher']?
+        set 'Persistent Thread Watcher', not data['Toggleable Thread Watcher']
     changes
 
   loadSettings: (data, cb) ->
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 0979c8a90..1b9c6c99f 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -36,7 +36,7 @@ ThreadWatcher =
       $.addClass doc, 'fixed-watcher'
     if !Conf['Persistent Thread Watcher']
       @dialog.hidden = true
-    
+
     Header.addShortcut 'watcher', sc, 510
 
     ThreadWatcher.fetchAuto()
diff --git a/src/config/Config.coffee b/src/config/Config.coffee
index 97169ff6a..cbf0d0373 100644
--- a/src/config/Config.coffee
+++ b/src/config/Config.coffee
@@ -385,7 +385,7 @@ Config =
         1
       ]
       'Persistent Thread Watcher': [
-        true
+        false
         'The thread watcher will be visible when the page is loaded.'
         1
       ]
diff --git a/src/main/Main.coffee b/src/main/Main.coffee
index d561c0fa8..5df1d4811 100644
--- a/src/main/Main.coffee
+++ b/src/main/Main.coffee
@@ -52,6 +52,7 @@ Main =
     Conf['Show Name and Subject'] = false
     Conf['QR Shortcut'] = true
     Conf['Bottom QR Link'] = true
+    Conf['Toggleable Thread Watcher'] = true
 
     # Pseudo-enforce default whitelist while configuration loads
     if $.platform is 'crx' then $.global ->