From 5e62950fb834608a9f78d50a92106b3c72b209c3 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Wed, 18 Feb 2015 21:28:06 -0800
Subject: [PATCH] Fix settings resetting for Firefox, again.

"Note that only the first denied property access from a given global object will be reported."
---
 src/General/lib/$.coffee | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/General/lib/$.coffee b/src/General/lib/$.coffee
index d4bb4ce10..825af4bc8 100755
--- a/src/General/lib/$.coffee
+++ b/src/General/lib/$.coffee
@@ -495,16 +495,15 @@ $.set = do ->
       set key, val
     return
 $.clear = (cb) ->
+  # XXX https://github.com/greasemonkey/greasemonkey/issues/2033
+  $.delete Object.keys(Conf)
+  $.delete ['previousversion', 'AutoWatch', 'cooldown.global', 'QR Size', 'captchas', 'QR.persona', 'hiddenPSA']
+  $.delete ("#{id}.position" for id in ['embedding', 'updater', 'thread-stats', 'thread-watcher', 'qr'])
+  boards = (a.textContent for a in $$ '#boardNavDesktop > .boardList > a')
+  boards.push 'qa'
+  $.delete ("cooldown.#{board}" for board in boards)
   try
     $.delete GM_listValues().map (key) -> key.replace g.NAMESPACE, ''
-  catch err
-    # XXX https://github.com/greasemonkey/greasemonkey/issues/2033
-    $.delete Object.keys(Conf)
-    $.delete ['previousversion', 'AutoWatch', 'cooldown.global', 'QR Size', 'captchas', 'QR.persona', 'hiddenPSA']
-    $.delete ("#{id}.position" for id in ['embedding', 'updater', 'thread-stats', 'thread-watcher', 'qr'])
-    boards = (a.textContent for a in $$ '#boardNavDesktop > .boardList > a')
-    boards.push 'qa'
-    $.delete ("cooldown.#{board}" for board in boards)
   cb?()
 <% } %>