Merge pull request #79 from lanfeust69/fix-uninstall

govert · web-flow · commit 4ef37e19ddfa · 2019-05-22T12:12:32.000+02:00
Fix possible crash in IntelliSenseServer.Uninstall()
diff --git a/Source/ExcelDna.IntelliSense/IntelliSenseServer.cs b/Source/ExcelDna.IntelliSense/IntelliSenseServer.cs
@@ -111,6 +111,8 @@ public static void Install()
         public static void Uninstall()
         {
             Logger.Initialization.Info($"IntelliSenseServer.Uninstall Begin: Version {ServerVersion} in {AppDomain.CurrentDomain.FriendlyName}");
+            if (IsDisabled())
+                return;
 
             UnpublishRegistration();
             if (_isActive)

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,8 @@ public static void Install()`
`111`	`111`	`public static void Uninstall()`
`112`	`112`	`{`
`113`	`113`	`Logger.Initialization.Info($"IntelliSenseServer.Uninstall Begin: Version {ServerVersion} in {AppDomain.CurrentDomain.FriendlyName}");`
	`114`	`+ if (IsDisabled())`
	`115`	`+ return;`
`114`	`116`
`115`	`117`	`UnpublishRegistration();`
`116`	`118`	`if (_isActive)`