X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=client%2Fassets%2Fsrc%2Fmodels%2Fapplication.js;h=2f4c2d9c735c01d73a670cfea6ea678d3a721713;hb=e70e1023588ff459a87fa78716caeb32f4994b9f;hp=3fd84f0aaf0b168bd01901ab7778731ed117814b;hpb=12adecdd43a3c420c0623c0c4f178a816983f502;p=KiwiIRC.git

diff --git a/client/assets/src/models/application.js b/client/assets/src/models/application.js
index 3fd84f0..2f4c2d9 100644
--- a/client/assets/src/models/application.js
+++ b/client/assets/src/models/application.js
@@ -32,6 +32,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);
+            }
         };
 
 
@@ -49,7 +54,6 @@ _kiwi.model.Application = function () {
 
             this.initializeClient();
             this.initializeGlobals();
-            this.applyDefaultClientSettings(this.server_settings.client.settings);
 
             this.view.barsHide(true);
 
@@ -181,6 +185,9 @@ _kiwi.model.Application = function () {
 
                 if (this.server_settings.client.channel)
                     defaults.channel = this.server_settings.client.channel;
+
+                if (this.server_settings.client.channel_key)
+                    defaults.channel_key = this.server_settings.client.channel_key;
             }
 
 
@@ -285,6 +292,10 @@ _kiwi.model.Application = function () {
                     defaults.channel = this.server_settings.connection.channel;
                 }
 
+                if (this.server_settings.connection.channel_key) {
+                    defaults.channel_key = this.server_settings.connection.channel_key;
+                }
+
                 if (this.server_settings.connection.nick) {
                     defaults.nick = this.server_settings.connection.nick;
                 }