From fa7d2a47904590a8ae1965168e5b17228e21680f Mon Sep 17 00:00:00 2001 From: AnturK Date: Thu, 28 Dec 2017 16:03:20 +0100 Subject: [PATCH 1/2] Makes default admin volume work again. (#33875) --- .../modules/goonchat/browserassets/js/browserOutput.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/goonchat/browserassets/js/browserOutput.js b/code/modules/goonchat/browserassets/js/browserOutput.js index 4ca135bfd7..b9aa5fb94c 100644 --- a/code/modules/goonchat/browserassets/js/browserOutput.js +++ b/code/modules/goonchat/browserassets/js/browserOutput.js @@ -641,7 +641,11 @@ $(function() { opts.updatedVolume = newVolume; sendVolumeUpdate(); internalOutput('Loaded music volume of: '+savedConfig.smusicVolume+'', 'internal'); - } + } + else{ + $('#adminMusic').prop('volume', opts.defaultMusicVolume / 100); + } + if (savedConfig.smessagecombining) { if (savedConfig.smessagecombining == 'false') { opts.messageCombining = false; @@ -649,9 +653,7 @@ $(function() { opts.messageCombining = true; } } - else { - $('#adminMusic').prop('volume', opts.defaultMusicVolume / 100); - } + (function() { var dataCookie = getCookie('connData');