From da7a28a81e2fced058a8ee48510d91f0d7d4873b Mon Sep 17 00:00:00 2001 From: Seth Call Date: Fri, 20 Sep 2013 17:46:36 +0000 Subject: [PATCH] * revert latest change regarding configuration of tracks --- web/app/assets/javascripts/configureTrack.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/configureTrack.js b/web/app/assets/javascripts/configureTrack.js index 509f43119..1dbae8378 100644 --- a/web/app/assets/javascripts/configureTrack.js +++ b/web/app/assets/javascripts/configureTrack.js @@ -541,7 +541,14 @@ // logger.debug("channel id=" + val.id + ", channel input=" + val.input + ", channel assignment=" + currAssignment + // ", channel name=" + val.name + ", channel type=" + val.device_type + ", chat=" + val.chat); - if (chat && ($.inArray(val.device_id, musicDevices) > -1 || context.jamClient.TrackIsMusicDeviceType(val.device_type))) { + var os = context.jamClient.GetOSAsString(); + if (os === context.JK.OS.WIN32) { + if (chat && ($.inArray(val.device_id, musicDevices) > -1 || context.jamClient.TrackIsMusicDeviceType(val.device_type))) { + return; + } + } + else { + if (chat && ($.inArray(val.device_id, musicDevices) > -1 || !context.jamClient.TrackIsMusicDeviceType(val.device_type))) { return; }