rename setting EnableWatchdog into AutoInject and some UI bug fixes

komefai · Sep 18, 2017 · b57a6ed · b57a6ed
1 parent 8a36c76
commit b57a6ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/PS4Macro/Classes/Settings.cs b/PS4Macro/Classes/Settings.cs
@@ -35,12 +35,12 @@ public class Settings
     {
         public const string FILE_PATH = "settings.xml";
 
-        public bool EnableWatchdog { get; set; }
+        public bool AutoInject { get; set; }
         public string StartupFile { get; set; }
 
         public Settings()
         {
-            EnableWatchdog = false;
+            AutoInject = false;
             StartupFile = null;
         }
 

diff --git a/PS4Macro/Forms/MainForm.cs b/PS4Macro/Forms/MainForm.cs
@@ -70,7 +70,7 @@ public MainForm()
             m_SaveLoadHelper.PropertyChanged += SaveLoadHelper_PropertyChanged;
 
             // Enable watchdog based on settings
-            if (!Program.Settings.EnableWatchdog)
+            if (!Program.Settings.AutoInject)
             {
                 Interceptor.InjectionMode = InjectionMode.Compatibility;
             }
@@ -92,7 +92,7 @@ public MainForm()
                 else
                 {
                     // Handle exception if watchdog is disabled
-                    if (!Program.Settings.EnableWatchdog)
+                    if (!Program.Settings.AutoInject)
                     {
                         MessageBox.Show(string.Format("[{0}] - {1}", ex.GetType().ToString(), ex.Message), "Injection Failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         Environment.Exit(-1);
@@ -101,7 +101,7 @@ public MainForm()
             }
 
             // Start watchdog to automatically inject when possible
-            if (Program.Settings.EnableWatchdog)
+            if (Program.Settings.AutoInject)
             {
                 Interceptor.Watchdog.Start();
             }
@@ -122,6 +122,10 @@ private void SetControlMode(ControlMode controlMode)
             }
             else if (m_ControlMode == ControlMode.Script)
             {
+                // Stop macro player
+                if (m_MacroPlayer.IsRecording) m_MacroPlayer.Record();
+                m_MacroPlayer.Stop();
+
                 // Setup callback to interceptor
                 Interceptor.Callback = new InterceptionDelegate(m_ScriptHost.OnReceiveData);