diff --git a/Assets/Script/Data/SongInfo.Sources.cs b/Assets/Script/Data/SongInfo.Sources.cs index 5b9614bb3..09df5d6f2 100644 --- a/Assets/Script/Data/SongInfo.Sources.cs +++ b/Assets/Script/Data/SongInfo.Sources.cs @@ -59,7 +59,6 @@ public partial class SongInfo { { "rb3dlc", "Rock Band 3 DLC" }, { "rb4_dlc", "Rock Band 4 DLC" }, { "rb4dlc", "Rock Band 4 DLC" }, - { "rb4_dlc", "Rock Band 4 DLC" }, { "rb4_rivals", "Rock Band Rivals" }, { "rbtp_acdc", "Rock Band Track Pack: AC/DC Live" }, { "rbtp_classic_rock", "Rock Band Track Pack: Classic Rock" }, @@ -192,7 +191,7 @@ private static string SourceToGameName(string source) { if (source is null) { return "Unknown Source"; } - + if (SongLibrary.SourceNames != null && SongLibrary.SourceNames.TryGetValue(source, out string name)) { return name; } diff --git a/Assets/Script/UI/AddPlayer.cs b/Assets/Script/UI/AddPlayer.cs index 782ab2e73..d0ea6479c 100644 --- a/Assets/Script/UI/AddPlayer.cs +++ b/Assets/Script/UI/AddPlayer.cs @@ -217,14 +217,17 @@ private string GetDebounceText(long debounce) => debounce >= ControlBinding.DEBOUNCE_MINIMUM ? debounce.ToString() : null; private void StartBind() { - if (inputStrategy.Mappings.Count < 1 || botMode) { + // Skip in certain conditions + if (inputStrategy.Mappings.Count < 1 || botMode || + selectedDevice?.micIndex != InputStrategy.INVALID_MIC_INDEX) { + DoneBind(); return; } var device = selectedDevice?.device; if (device == null) { - Debug.Assert(false, "No device selected when binding!"); + Debug.LogError("No device selected when binding!"); return; } @@ -302,8 +305,8 @@ private void StartBind() { // Only controls that have changed | Constantly-changing controls like accelerometers | Non-physical controls like stick up/down/left/right var flags = Enumerate.IgnoreControlsInCurrentState | Enumerate.IncludeNoisyControls | Enumerate.IncludeSyntheticControls; var activeControls = from control in eventPtr.EnumerateControls(flags, device) - where ControlAllowedAndActive(control, eventPtr) - select control as InputControl; + where ControlAllowedAndActive(control, eventPtr) + select control as InputControl; if (activeControls != null) { foreach (var ctrl in activeControls) {