From 47a36a2e5629a930ad0d363deb511008bd3206e7 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 11 Jan 2017 12:46:18 +0200
Subject: [PATCH] Fixed customcss and fav emotes load handling

---
 js/main.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/main.js b/js/main.js
index eb05974..8252c6d 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1196,7 +1196,7 @@ QuickEmoteMenu.prototype.init = function() {
     });
     this.favoriteEmotes = {};
     var fe = bdStorage.get("bdfavemotes");
-    if (fe != undefined) {
+    if (fe !== null) {
         this.favoriteEmotes = JSON.parse(atob(fe));
     }
 
@@ -1751,7 +1751,11 @@ SettingsPanel.prototype.construct = function () {
     //End emote settings
 
     //Custom CSS Editor
-    var ccss = atob(window.bdStorage.get("bdcustomcss"));
+    var _ccss = window.bdStorage.get("bdcustomcss");
+    var ccss = "";
+    if(_ccss !== null) {
+        ccss = atob(_ccss);
+    }
     customCssEditor.applyCustomCss(ccss, true, false);
 
     settingsInner += '\