Merge branch 'jay' into vigem-udpserver

DS4Windows/DS4Control/UdpServer.cs

@@ -177,6 +177,7 @@ namespace DS4Windows
             SocketAsyncEventArgs args = new SocketAsyncEventArgs();
             args.RemoteEndPoint = clientEP;
             args.SetBuffer(packetData, 0, packetData.Length);
+            args.Completed += ClearSentData;
             try { udpSock.SendToAsync(args); }
             catch (Exception e) { }
         }
@@ -634,6 +635,7 @@ namespace DS4Windows
                     SocketAsyncEventArgs args = new SocketAsyncEventArgs();
                     args.RemoteEndPoint = cl;
                     args.SetBuffer(outputData, 0, outputData.Length);
+                    args.Completed += ClearSentData;
                     try { udpSock.SendToAsync(args); }
                     catch (SocketException ex) { }
                 }
@@ -642,5 +644,11 @@ namespace DS4Windows
             clientsList.Clear();
             clientsList = null;
         }
+
+        private void ClearSentData(object sender, SocketAsyncEventArgs args)
+        {
+            args.Dispose();
+            args = null;
+        }
     }
 }

DS4Windows/DS4Forms/DS4Form.cs

@@ -1536,17 +1536,10 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
             toolStrip1.Visible = true;
             toolStrip1.Enabled = true;
             lbLastMessage.ForeColor = SystemColors.GrayText;
-            int lvDebugItemCount = lvDebug.Items.Count;
-            if (lvDebugItemCount > 0)
-            {
-                lbLastMessage.Text = lvDebug.Items[lvDebugItemCount - 1].SubItems[1].Text;
-            }
 
-            opt.inputtimer.Stop();
-            opt.sixaxisTimer.Stop();
             opt.Dock = DockStyle.None;
             tabProfiles.Controls.Remove(opt);
-            optPop = false;
+            optPop = false; opt = null;
 
             lBProfiles.Visible = true;
         }

DS4Windows/DS4Forms/Options.cs

@@ -1671,9 +1671,8 @@ namespace DS4Windows
             inputtimer.Stop();
             sixaxisTimer.Stop();
             root.OptionsClosed();
-            lVActions.ItemCheck -= this.lVActions_ItemCheck;
             Visible = false;
-            e.Cancel = true;
+            e.Cancel = false;
         }
 
         private void cBSlide_CheckedChanged(object sender, EventArgs e)

DS4Windows/Properties/AssemblyInfo.cs

@@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
 // 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.5.4")]
-[assembly: AssemblyFileVersion("1.5.4")]
+[assembly: AssemblyVersion("1.5.5")]
+[assembly: AssemblyFileVersion("1.5.5")]
 [assembly: NeutralResourcesLanguage("en")]
 

README.md

@@ -2,26 +2,33 @@
 
 Like those other ds4tools, but sexier.
 
-DS4Windows is an extract anywhere program that allows you to get the best DualShock 4 experience on your PC. By emulating a Xbox 360 controller, many more games are accessible.
-
-You can find the latest and older versions [here](https://github.com/Ryochan7/DS4Windows/releases).
-
-ViGEm build with UdpServer included for using Gyro motion controls in Cemu.
-
-http://ryochan7.xyz/ds4windows/test/DS4Windows_1.5.3_ViGEm_UdpServer_x64.zip
+DS4Windows is an extract anywhere program that allows you to get the best
+DualShock 4 experience on your PC. By emulating a Xbox 360 controller, many
+more games are accessible.
 
 This project is a fork of the work of Jays2Kings. You can find the old project
 website at [ds4windows.com](http://ds4windows.com).
 
+## Downloads
+
+- **[Main builds of DS4Windows](https://github.com/Ryochan7/DS4Windows/releases)**
+- Alternative builds:
+  - [UdpServer ViGEm build](http://ryochan7.xyz/ds4windows/test/DS4Windows_1.5.4_ViGEm_UdpServer_x64.zip)
+
 ## Requirements
 
 - Windows 7 SP1 or newer
-- [Microsoft .NET 4.6.1 or higher (needed to unzip the driver and for macros to work properly)](https://www.microsoft.com/en-us/download/details.aspx?id=49982)
-- SCP Virtual Bus Driver (Downloaded & Installed with DS4Windows)
-- Microsoft 360 Driver (link inside DS4Windows, already installed on Windows 7 SP1 and higher or if you've used a 360 controller before)
-- Sony DualShock 4 (This should be obvious)
+- [Microsoft .NET 4.6.1 or higher (needed to unzip the driver and for macros to
+work properly)](https://www.microsoft.com/en-us/download/details.aspx?id=49982)
+- SCP Virtual Bus Driver (DS4Windows will install it for you)
+- Microsoft 360 Driver (link inside DS4Windows, already installed by Windows if
+you've used a 360 controller before)
+- Sony DualShock 4 🤔
+- Connection method:
   - Micro USB cable
-- (Optional)Bluetooth 2.1+, via adapter or built in pc [(My recommendation)](https://www.newegg.com/Product/Product.aspx?Item=N82E16833166126) (Toshiba's bluetooth adapters currently do not work)
+  - Bluetooth 2.1+ (via an
+  [adapter like this](https://www.newegg.com/Product/Product.aspx?Item=N82E16833166126)
+  or built in pc). Toshiba's adapters currently do not work.
 
 ## Device Detection Issue
 
@@ -33,12 +40,11 @@ works then. Although this problem mainly affected versions of
 DS4Windows prior to 1.4.109 when using some applications, other mapping
 programs can cause the same problem to occur.
 
-
 If you suspect that your DS4 has been disabled, open the Device Manager
 (Control Panel\Hardware and Sound\Device Manager) and look for devices listed
 under the path "Human Interface Devices\HID-compliant game controller".
 
-![Disabled Device Example](https://raw.githubusercontent.com/Ryochan7/DS4Windows/jay/disabled_device_example_small.png)
+![Disabled Device Example](https://i.imgur.com/KI3QX2i.png)
 
 If the icon shown for a device has a down arrow icon then you should
 check the device's device instance path and see if the device is a
@@ -60,9 +66,8 @@ rejected if no reasonable solution can be found to incorporate code changes.
 If you would like to send some coin my way, here are some means by
 which to do so.
 
-Bitcoin: 1DnMJwjdd7JRfHJap2mmTmADYm38SzR2z9  
-Dogecoin: D9fhbXp9bCHEhuS8vX1BmVu6t7Y2nVNUCK  
-Litecoin: La5mniW7SFMH2RhqDgUty3RwkBSYbjbnJ6  
-Monero: 49RvRMiMewaeez1Y2auxHmfMaAUYfhUpBem4ohzRJd9b5acPcxzh1icjnhZfjnYd1S7NQ57reQ7cP1swGre3rpfzUgJhEB7  
-PayPal: https://paypal.me/ryochan7
-
+**Bitcoin:** 1DnMJwjdd7JRfHJap2mmTmADYm38SzR2z9  
+**Dogecoin:** D9fhbXp9bCHEhuS8vX1BmVu6t7Y2nVNUCK  
+**Litecoin:** La5mniW7SFMH2RhqDgUty3RwkBSYbjbnJ6  
+**Monero:** 49RvRMiMewaeez1Y2auxHmfMaAUYfhUpBem4ohzRJd9b5acPcxzh1icjnhZfjnYd1S7NQ57reQ7cP1swGre3rpfzUgJhEB7  
+**PayPal:** https://paypal.me/ryochan7