From: Darren <darren@darrenwhitlen.com>
Date: Fri, 19 Jul 2013 21:07:16 +0000 (+0100)
Subject: Client: Apply default settings before applying any others
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4966ba533a67240c66d819ff7e2ca2e98d6f3bc0;p=KiwiIRC.git

Client: Apply default settings before applying any others
---

diff --git a/client/assets/src/models/application.js b/client/assets/src/models/application.js
index 60d7ee3..c2bf0fe 100644
--- a/client/assets/src/models/application.js
+++ b/client/assets/src/models/application.js
@@ -31,6 +31,11 @@ _kiwi.model.Application = function () {
 
             // Takes instances of model_network
             this.connections = new _kiwi.model.NetworkPanelList();
+
+            // Set any default settings before anything else is applied
+            if (this.server_settings && this.server_settings.client && this.server_settings.client.settings) {
+                this.applyDefaultClientSettings(this.server_settings.client.settings);
+            }
         };
 
 
@@ -48,7 +53,6 @@ _kiwi.model.Application = function () {
 
             this.initializeClient();
             this.initializeGlobals();
-            this.applyDefaultClientSettings(this.server_settings.client.settings);
 
             this.view.barsHide(true);