Merge branch 'release/trigger-test' into main

micro-artwork · Oct 26, 2021 · 7142384 · 7142384
2 parents 463b51a + 405fa31
commit 7142384
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/XI2DS/Program.cs b/XI2DS/Program.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -14,16 +15,28 @@ static class Program
         [STAThread]
         static void Main()
         {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            try
+            bool excutable;            
+            Mutex mutex = new Mutex(true, "XI2DS", out excutable);
+            if (excutable)
             {
-                Application.Run(new FormMain());
-            } catch (Exception e)
+
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+                try
+                {
+                    Application.Run(new FormMain());
+                }
+                catch (Exception e)
+                {
+                    Application.Exit();
+                }
+                mutex.ReleaseMutex();
+            }
+            else
             {
-                Application.Exit();
+                MessageBox.Show("XI2DS is running already");
+                return;
             }
-
         }
     }
 }
diff --git a/XI2DS/Properties/AssemblyInfo.cs b/XI2DS/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
 // 기본값으로 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
+[assembly: AssemblyVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.2.0")]
diff --git a/XI2DS/Utils.cs b/XI2DS/Utils.cs
@@ -127,11 +127,13 @@ public static DualShock4Report XInputStateToDS4Report(State state)
 
             if (gamepad.LeftTrigger > Gamepad.TriggerThreshold)
             {
+                report.SetButtons(DualShock4Buttons.TriggerLeft);
                 report.SetAxis(DualShock4Axes.LeftTrigger, gamepad.LeftTrigger);
             }
 
             if (gamepad.RightTrigger > Gamepad.TriggerThreshold)
             {
+                report.SetButtons(DualShock4Buttons.TriggerRight);
                 report.SetAxis(DualShock4Axes.RightTrigger, gamepad.RightTrigger);
             }