From 8fd523664116787113988c4bc6a9fe9ab3b5500b Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 12 Jul 2016 17:06:23 -0400
Subject: [PATCH] closes #4844

---
 public/src/admin/settings.js        | 16 +++-------------
 src/views/admin/settings/footer.tpl |  2 +-
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js
index acfa654556..ebd986c3e0 100644
--- a/public/src/admin/settings.js
+++ b/public/src/admin/settings.js
@@ -4,14 +4,6 @@
 define('admin/settings', ['uploader', 'sounds'], function(uploader, sounds) {
 	var Settings = {};
 
-	Settings.init = function() {
-		if (!app.config) {
-			$(window).on('action:config.loaded', Settings.prepare);
-		} else {
-			Settings.prepare();
-		}
-	};
-
 	Settings.populateTOC = function() {
 		$('.settings-header').each(function() {
 			var header = $(this).text(),
@@ -168,11 +160,9 @@ define('admin/settings', ['uploader', 'sounds'], function(uploader, sounds) {
 				return callback(err);
 			}
 
-			if (app.config) {
-				for(var field in data) {
-					if (data.hasOwnProperty(field)) {
-						app.config[field] = data[field];
-					}
+			for(var field in data) {
+				if (data.hasOwnProperty(field)) {
+					app.config[field] = data[field];
 				}
 			}
 
diff --git a/src/views/admin/settings/footer.tpl b/src/views/admin/settings/footer.tpl
index fc80967c47..af46d0ad59 100644
--- a/src/views/admin/settings/footer.tpl
+++ b/src/views/admin/settings/footer.tpl
@@ -6,7 +6,7 @@
 
 <script>
 	require(['admin/settings'], function(Settings) {
-		Settings.init();
+		Settings.prepare();
 		Settings.populateTOC();
 	});
 </script>