Debugger: Lua - Add option to auto-restart scripts after power cyclin…

…g or reloading the rom
SourMesen · May 3, 2020 · 527db70 · 527db70
1 parent 9772aa0
commit 527db70
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 12 deletions.
diff --git a/GUI.NET/Config/DebugInfo.cs b/GUI.NET/Config/DebugInfo.cs
@@ -372,6 +372,7 @@ public class DebugInfo
 		public int ScriptCodeWindowHeight = 0;
 		public List<string> RecentScripts = new List<string>();
 		public bool SaveScriptBeforeRun = true;
+		public bool AutoRestartScript = true;
 		public ScriptStartupBehavior ScriptStartupBehavior = ScriptStartupBehavior.ShowTutorial;
 		public bool AutoLoadLastScript = true;
 		public string ScriptFontFamily = BaseControl.MonospaceFontFamily;

diff --git a/GUI.NET/Debugger/frmScript.Designer.cs b/GUI.NET/Debugger/frmScript.Designer.cs
diff --git a/GUI.NET/Debugger/frmScript.cs b/GUI.NET/Debugger/frmScript.cs
@@ -109,6 +109,7 @@ public frmScript(bool forceBlank = false)
 
 			RestoreLocation(config.ScriptWindowLocation, config.ScriptWindowSize);
 			mnuSaveBeforeRun.Checked = config.SaveScriptBeforeRun;
+			mnuAutoRestart.Checked = config.AutoRestartScript;
 
 			if(config.ScriptCodeWindowHeight >= ctrlSplit.Panel1MinSize) {
 				if(config.ScriptCodeWindowHeight == Int32.MaxValue) {
@@ -151,11 +152,27 @@ private void InitShortcuts()
 
 		private void _notifListener_OnNotification(InteropEmu.NotificationEventArgs e)
 		{
-			if(e.NotificationType == InteropEmu.ConsoleNotificationType.GameStopped) {
-				this._scriptId = -1;
-				this.BeginInvoke((Action)(() => {
-					lblScriptActive.Visible = false;
-				}));
+			switch(e.NotificationType) {
+				case InteropEmu.ConsoleNotificationType.EmulationStopped:
+					this._scriptId = -1;
+					break;
+
+				case InteropEmu.ConsoleNotificationType.GameStopped:
+					if(e.Parameter == IntPtr.Zero) {
+						this._scriptId = -1;
+					}
+					break;
+
+				case InteropEmu.ConsoleNotificationType.GameInitCompleted:
+					bool wasRunning = this._scriptId >= 0;
+					this._scriptId = -1;
+					this.BeginInvoke((Action)(() => {
+						lblScriptActive.Visible = false;
+						if(e.NotificationType == InteropEmu.ConsoleNotificationType.GameInitCompleted && wasRunning && mnuAutoRestart.Checked) {
+							RunScript();
+						}
+					}));
+					break;
 			}
 		}
 
@@ -185,6 +202,7 @@ protected override void OnClosing(CancelEventArgs e)
 			ConfigManager.Config.DebugInfo.ScriptFontStyle = txtScriptContent.OriginalFont.Style;
 			ConfigManager.Config.DebugInfo.ScriptFontSize = txtScriptContent.OriginalFont.Size;
 			ConfigManager.Config.DebugInfo.AutoLoadLastScript = mnuAutoLoadLastScript.Checked;
+			ConfigManager.Config.DebugInfo.AutoRestartScript = mnuAutoRestart.Checked;
 			ConfigManager.ApplyChanges();
 
 			base.OnClosing(e);