The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-01-13 08:39:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check for valid trigger names. Check for null value

Browse Source
This commit is contained in:
Travis Nickles 2019-12-30 22:35:31 -06:00
parent 694af58154
commit be93e16da6
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
DS4Windows/DS4Forms/SpecialActionEditor.xaml.cs
View File

@ -124,28 +124,44 @@ namespace DS4WinWPF.DS4Forms
private void LoadAction(DS4Windows.SpecialAction specialAction)
{
specialActVM.LoadAction(specialAction);
foreach(string control in specialActVM.ControlTriggerList)
string[] tempTriggers = specialActVM.ControlTriggerList.ToArray();
foreach (string control in tempTriggers)
{
foreach(CheckBox box in triggerBoxes)
bool found = false;
foreach (CheckBox box in triggerBoxes)
{
if (box.Tag.ToString() == control)
{
box.IsChecked = true;
found = true;
break;
}
}
if (!found)
{
specialActVM.ControlTriggerList.Remove(control);
}
}
foreach (string control in specialActVM.ControlUnloadTriggerList)
tempTriggers = specialActVM.ControlUnloadTriggerList.ToArray();
foreach (string control in tempTriggers)
{
bool found = false;
foreach (CheckBox box in unloadTriggerBoxes)
{
if (box.Tag.ToString() == control)
{
box.IsChecked = true;
found = true;
break;
}
}
if (!found)
{
specialActVM.ControlUnloadTriggerList.Remove(control);
}
}
switch (specialAction.typeID)

5
DS4Windows/DS4Forms/ViewModels/SpecialActions/LoadProfileViewModel.cs
View File

@ -63,6 +63,11 @@ namespace DS4WinWPF.DS4Forms.ViewModels.SpecialActions
if (profileIndex > 0)
{
string profilename = profileList.ProfileListCol[profileIndex - 1].Name;
if (action.ucontrols == null)
{
action.ucontrols = string.Empty;
}
Global.SaveAction(action.name, action.controls, 3, profilename, edit,
action.ucontrols +
(autoUntrigger ? ((action.ucontrols?.Length ?? 0) > 0 ? "/" : "") + "AutomaticUntrigger" : ""));