From 0de6b076271b673d0e1dcc2b74b2ddd1646bf08e Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Sun, 31 May 2015 16:35:09 +0100
Subject: Rewrite settings as a tight wrapper around Settings, tweaks for tests

---
 lib/settings.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/settings.coffee b/lib/settings.coffee
index b5021225..88e3b883 100644
--- a/lib/settings.coffee
+++ b/lib/settings.coffee
@@ -81,7 +81,7 @@ root.Settings = Settings =
 
   get: (key) ->
     console.log "WARNING: Settings have not loaded yet; using the default value for #{key}." unless @isLoaded
-    if (key of @cache) then JSON.parse(@cache[key]) else @defaults[key]
+    if key of @cache and @cache[key]? then JSON.parse(@cache[key]) else @defaults[key]
 
   set: (key, value) ->
     # Don't store the value if it is equal to the default, so we can change the defaults in the future
-- 
cgit v1.2.3