Merge pull request #16 from Therena/Bugfix-15

Fix for bug 15 Latest release update to VS2019, reset all ConEmu settings and throws an error everytime
Therena · Aug 19, 2020 · 55ea23a · 55ea23a
2 parents afb9189 + a7716ae
commit 55ea23a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/ConEmuIntegration/ConEmuProduct/ProductEnvironment.cs b/ConEmuIntegration/ConEmuProduct/ProductEnvironment.cs
@@ -96,7 +96,7 @@ public void OpenConEmuToolWindow()
 
                 if (IsConEmuToolWindowVisible(windowFrame) == false)
                 {
-                    window.ConEmuControl.RunConEmu();
+                    window.RunConEmu();
                 }
             }
             catch (Exception error)

diff --git a/ConEmuIntegration/ToolWindow/ConEmuWindow.cs b/ConEmuIntegration/ToolWindow/ConEmuWindow.cs
@@ -25,14 +25,25 @@ namespace ConEmuIntegration.ToolWindow
     [Guid("F4D34FFE-6D41-47F1-BD2C-7897995974AB")]
     public class ConEmuWindow : ToolWindowPane
     {
-        public ConEmuWindowControl ConEmuControl { get; } = new ConEmuWindowControl();
+        private ConEmuWindowControl m_ConEmuControl;
 
         public ConEmuWindow() : base(null)
         {
             this.Caption = ProductEnvironment.Instance.GetWindowCaption();
 
-            ConEmuControl.ConEmuClosed += ConEmuClosed;
-            this.Content = ConEmuControl;
+            m_ConEmuControl = new ConEmuWindowControl();
+            m_ConEmuControl.ConEmuClosed += ConEmuClosed;
+            this.Content = m_ConEmuControl;
+        }
+
+        public bool RunConEmu()
+        {
+            if (null == m_ConEmuControl)
+            {
+                return false;
+            }
+
+            return m_ConEmuControl.RunConEmu();
         }
 
         private void ConEmuClosed(object sender, EventArgs e)

diff --git a/ConEmuIntegration/source.extension.vsixmanifest b/ConEmuIntegration/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="D643A537-A9F4-43A6-9374-2C452B46300E" Version="2.2019.0.4" Language="en-US" Publisher="David Roller" />
+        <Identity Id="D643A537-A9F4-43A6-9374-2C452B46300E" Version="2.2019.0.5" Language="en-US" Publisher="David Roller" />
         <DisplayName>ConEmu Integration 2019</DisplayName>
         <Description xml:space="preserve">Integrate the console emulator ConEmu in Visual Studio</Description>
         <License>Resources\LICENSE</License>