Avoid deadlock when opening a solution

Author: IvoKrugers

VisualStudioMac.OneClickToOpenFile/CommandHandlers/StartupCommandHandler.cs

@@ -1,4 +1,5 @@
-using MonoDevelop.Components.Commands;
+using System.Threading.Tasks;
+using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
 
 namespace VisualStudioMac.OneClickToOpenFile.CommandHandlers
@@ -8,26 +9,24 @@ public class StartupCommandHandler : CommandHandler
         protected override void Run()
         {
             Settings.OneClickToOpenFileEnabled = false;
-            //IdeApp.Workspace.SolutionLoaded += (s, e) => Settings.OneClickToOpenFileEnabled = true;
-            //IdeApp.Workspace.SolutionUnloaded += (s, e) => Settings.OneClickToOpenFileEnabled = false;
+            IdeApp.Workspace.SolutionLoaded += Workspace_SolutionLoaded;
+            IdeApp.Workspace.SolutionUnloaded += (s, e) => Settings.OneClickToOpenFileEnabled = false;
             //IdeApp.Workbench.LayoutChanged += Workbench_LayoutChanged;
             //IdeApp.Exiting += (s,e) => Settings.OneClickToOpenFileEnabled = false;
             //IdeApp.Workbench.GuiLocked += (s, e) => Settings.OneClickToOpenFileEnabled = false;
             //IdeApp.Workbench.GuiUnlocked += (s, e) => Settings.OneClickToOpenFileEnabled = true;
         }
 
-        //private void Workbench_LayoutChanged(object sender, System.EventArgs e)
-        //{
-        //    Settings.OneClickToOpenFileEnabled = IdeApp.Workbench.CurrentLayout != null;
-        //}
-
-        //private void Workspace_SolutionLoaded(object sender, MonoDevelop.Projects.SolutionEventArgs e)
-        //{
-        //    IdeApp.Workspace.SolutionLoaded -= Workspace_SolutionLoaded;
-        //    if (e.Solution != null)
-        //    {
-        //        //Settings.OneClickToOpenFileEnabled = true;
-        //    }
-        //}
+        private void Workspace_SolutionLoaded(object sender, MonoDevelop.Projects.SolutionEventArgs e)
+        {
+            if (e.Solution != null)
+            {
+                Task.Delay(10000).ContinueWith(async t =>
+                {
+                    await t;
+                    Settings.OneClickToOpenFileEnabled = true;
+                });
+            }
+        }
     }
 }

VisualStudioMac.OneClickToOpenFile/Properties/Manifest.addin.xml

@@ -11,7 +11,7 @@ by Ivo Krugers
 
 "
        category    = "IDE extensions"
-       version     = "17.4">
+       version     = "17.4.1">
 
 	<!--<Runtime>
 		<Import assembly="VisualStudioMac.OneClickToOpenFile.dll" />