The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-29 12:34:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Version 1.4.269

Browse Source 
Fixed trying to edit actions with Xbox Game DVR
Fixed Hide DS4 crashing DS4Windows on 64-bit machines
This commit is contained in:
jays2kings 2015-08-01 17:24:08 -04:00
parent f5c9dbff11
commit 0cbcccc9ee
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DS4Windows/DS4Windows.csproj
View File

@ -23,6 +23,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>

10
DS4Windows/DS4Windows/SpecActions.cs
View File

@ -26,7 +26,7 @@ namespace DS4Windows
int editIndex; int editIndex;
protected String m_Actions = Global.appdatapath + "\\Actions.xml"; protected String m_Actions = Global.appdatapath + "\\Actions.xml";
string oldprofilename; string oldprofilename;
bool loadingThings; bool loadingAction = true;
public SpecActions(Options opt, string edit = "", int editindex = -1) public SpecActions(Options opt, string edit = "", int editindex = -1)
{ {
InitializeComponent(); InitializeComponent();
@ -53,12 +53,12 @@ namespace DS4Windows
oldprofilename = edit; oldprofilename = edit;
tBName.Text = edit; tBName.Text = edit;
LoadAction(); LoadAction();
loadingAction = false;
} }
} }
void LoadAction() void LoadAction()
{ {
loadingThings = true;
SpecialAction act = Global.GetAction(oldprofilename); SpecialAction act = Global.GetAction(oldprofilename);
string[] dets; string[] dets;
foreach (string s in act.controls.Split('/')) foreach (string s in act.controls.Split('/'))
@ -131,7 +131,7 @@ namespace DS4Windows
case "XboxGameDVR": case "XboxGameDVR":
cBActions.SelectedIndex = 7; cBActions.SelectedIndex = 7;
dets = act.details.Split(','); dets = act.details.Split(',');
if (int.Parse(dets[0]) == 0) if (int.Parse(dets[3]) == 0)
btnCustomDVRKey.Text = "Custom Key"; btnCustomDVRKey.Text = "Custom Key";
else else
btnCustomDVRKey.Text = ((Keys)(int.Parse(dets[3]))).ToString(); btnCustomDVRKey.Text = ((Keys)(int.Parse(dets[3]))).ToString();
@ -348,7 +348,7 @@ namespace DS4Windows
if (cBActions.SelectedIndex == 7 && e.Item.Checked) if (cBActions.SelectedIndex == 7 && e.Item.Checked)
{ {
foreach (ListViewItem lvi in lVTrigger.Items) foreach (ListViewItem lvi in lVTrigger.Items)
if (lvi.Checked && lvi != e.Item) if (lvi != null && lvi.Checked && lvi != e.Item)
lvi.Checked = false; lvi.Checked = false;
} }
} }
@ -442,7 +442,7 @@ namespace DS4Windows
{ {
if (((ComboBox)sender).SelectedIndex == 3) if (((ComboBox)sender).SelectedIndex == 3)
{ {
if (!loadingThings) if (!loadingAction)
new KBM360(this, btnCustomDVRKey, false).ShowDialog(); new KBM360(this, btnCustomDVRKey, false).ShowDialog();
cBTapDVR.Items.RemoveAt(3); cBTapDVR.Items.RemoveAt(3);
cBTapDVR.Items.Insert(3, "Take Screenshot (" + btnCustomDVRKey.Text + ")"); cBTapDVR.Items.Insert(3, "Take Screenshot (" + btnCustomDVRKey.Text + ")");

4
DS4Windows/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.267")] [assembly: AssemblyVersion("1.4.269")]
[assembly: AssemblyFileVersion("1.4.267")] [assembly: AssemblyFileVersion("1.4.269")]