"Attach to Hazelnut" button is no longer disabled after attaching

- Temporarily made it so that "Attach to Hazelnut" button isn't disabled when attaching to Hazelnut (it caused problems because if the debugger is attached when closing Hazelnut the button won't be re-enabled)
StudioCherno · Mar 23, 2022 · 511fa7b · 511fa7b
1 parent e42ac72
commit 511fa7b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/HazelToolsVS/Debugging/HazelDebuggerSession.cs b/HazelToolsVS/Debugging/HazelDebuggerSession.cs
@@ -1,7 +1,9 @@
 using System;
 using System.ComponentModel.Design;
+using System.IO;
 using Mono.Debugging.Client;
 using Mono.Debugging.Soft;
+using Mono.Debugger.Soft;
 
 namespace HazelToolsVS.Debugging
 {
@@ -26,7 +28,7 @@ protected override void OnRun(DebuggerStartInfo startInfo)
 			case HazelSessionType.AttachHazelnutDebugger:
 			{
 				m_IsAttached = true;
-				m_AttachToHazelnutMenuItem.Enabled = false;
+				//m_AttachToHazelnutMenuItem.Enabled = false;
 				base.OnRun(hazelStartInfo);
 				break;
 			}
@@ -38,7 +40,7 @@ protected override void OnRun(DebuggerStartInfo startInfo)
 		protected override void OnAttachToProcess(ProcessInfo processInfo)
 		{
 			base.OnAttachToProcess(processInfo);
-			m_AttachToHazelnutMenuItem.Enabled = false;
+			//m_AttachToHazelnutMenuItem.Enabled = false;
 		}
 
 		protected override string GetConnectingMessage(DebuggerStartInfo dsi)
@@ -50,7 +52,19 @@ protected override void OnConnectionError(Exception ex)
 		{
 			// The session was manually terminated
 			if (HasExited)
+			{
+				//m_AttachToHazelnutMenuItem.Enabled = true;
+				base.OnConnectionError(ex);
+				return;
+			}
+
+			if (ex is VMDisconnectedException || ex is IOException)
+			{
+				HasExited = true;
+				base.OnConnectionError(ex);
+				//m_AttachToHazelnutMenuItem.Enabled = true;
 				return;
+			}
 
 			string message = "An error occured when trying to attach to Hazelnut. Please make sure that Hazelnut is running and that it's up-to-date.";
 			message += Environment.NewLine;
@@ -71,22 +85,23 @@ protected override void OnConnectionError(Exception ex)
 			}
 
 			_ = HazelToolsPackage.Instance.ShowErrorMessageBoxAsync("Connection Error", message);
-			m_AttachToHazelnutMenuItem.Enabled = true;
+			//m_AttachToHazelnutMenuItem.Enabled = true;
 			base.OnConnectionError(ex);
 		}
 
 		protected override void OnExit()
 		{
 			if (m_IsAttached)
 			{
+				m_IsAttached = false;
 				base.OnDetach();
 			}
 			else
 			{
 				base.OnExit();
 			}
 
-			m_AttachToHazelnutMenuItem.Enabled = true;
+			//m_AttachToHazelnutMenuItem.Enabled = true;
 		}
 	}
 }
diff --git a/HazelToolsVS/LICENSE.txt b/HazelToolsVS/LICENSE.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Peter Nilsson
+Copyright (c) 2022 Studio Cherno
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/HazelToolsVS/source.extension.vsixmanifest b/HazelToolsVS/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="HazelToolsVS" Version="1.2.0" Language="en-US" Publisher="Peter Nilsson" />
+        <Identity Id="HazelToolsVS" Version="1.2.0" Language="en-US" Publisher="Studio Cherno" />
         <DisplayName>Hazel Tools</DisplayName>
         <Description xml:space="preserve">Visual Studio integration with the Hazelnut editor, including C# script debugging support</Description>
         <MoreInfo>https://github.com/peter1745/HazelTools-VisualStudio</MoreInfo>