diff --git a/web/app/assets/javascripts/wizard/gear_utils.js b/web/app/assets/javascripts/wizard/gear_utils.js index 2a326ee86..d5c70d9a1 100644 --- a/web/app/assets/javascripts/wizard/gear_utils.js +++ b/web/app/assets/javascripts/wizard/gear_utils.js @@ -34,9 +34,11 @@ // as well have a score below 20 ms gearUtils.canPlayWithOthers = function(profile) { - if(!context.jamClient.IsAudioStarted()) { - context.jamClient.ReloadAudioSystem(true, true, true); - context.jamClient.StopAudio(); + if(gon.global.gear_check_reload_audio) { + if (!context.jamClient.IsAudioStarted()) { + context.jamClient.ReloadAudioSystem(true, true, true); + context.jamClient.StopAudio(); + } } diff --git a/web/config/application.rb b/web/config/application.rb index ad3aff3e3..9a21433ce 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -332,5 +332,6 @@ if defined?(Bundler) config.alerts_api_enabled = true config.gear_check_ignore_high_latency = false + config.gear_check_reload_audio = true end end diff --git a/web/config/initializers/gon.rb b/web/config/initializers/gon.rb index ff5a4d74f..f9eb797f6 100644 --- a/web/config/initializers/gon.rb +++ b/web/config/initializers/gon.rb @@ -14,4 +14,5 @@ Gon.global.recurly_public_api_key = Rails.application.config.recurly_public_api_ Gon.global.one_free_jamtrack_per_user = Rails.application.config.one_free_jamtrack_per_user Gon.global.video_available = Rails.application.config.video_available Gon.global.gear_check_ignore_high_latency = Rails.application.config.gear_check_ignore_high_latency +Gon.global.gear_check_reload_audio = Rails.application.config.gear_check_reload_audio Gon.global.env = Rails.env