Version 1.4.269

Fixed trying to edit actions with Xbox Game DVR Fixed Hide DS4 crashing DS4Windows on 64-bit machines
Jays2Kings · Aug 1, 2015 · 0cbcccc · 0cbcccc
1 parent f5c9dbf
commit 0cbcccc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/DS4Windows/DS4Windows.csproj b/DS4Windows/DS4Windows.csproj
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

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

diff --git a/DS4Windows/Properties/AssemblyInfo.cs b/DS4Windows/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.267")]
-[assembly: AssemblyFileVersion("1.4.267")]
+[assembly: AssemblyVersion("1.4.269")]
+[assembly: AssemblyFileVersion("1.4.269")]