From 5c27aff06ffecc249edcdc6cc9d6daea8f137add Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Wed, 27 Jan 2016 11:44:00 -0500
Subject: Only set store preferences if not null in head.html

---
 web/templates/head.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'web')

diff --git a/web/templates/head.html b/web/templates/head.html
index 257877376..b1ec905b5 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -77,7 +77,9 @@
         window.mm_preferences = {{ .Preferences }};
 
         $(function() {
-            PreferenceStore.setPreferences(window.mm_preferences);
+            if (window.mm_preferences != null) {
+                PreferenceStore.setPreferences(window.mm_preferences);
+            }
         });
 
         if ({{.SessionTokenIndex}} >= 0) {
-- 
cgit v1.2.3-1-g7c22