Merge pull request #3844 from Vogel612/whoopsie-cleanup

Emergency fix for Code Explorer commands.
rubberduck-vba · Mar 15, 2018 · 443a039 · 443a039
2 parents 91f0a31 + 98d275b
commit 443a039
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Rubberduck.Main/Root/RubberduckIoCInstaller.cs b/Rubberduck.Main/Root/RubberduckIoCInstaller.cs
@@ -520,7 +520,8 @@ private Type[] ToolsMenuItems()
 
         private static void RegisterCodeExplorerViewModelWithCodeExplorerCommands(IWindsorContainer container)
         {
-            var codeExplorerCommands = Assembly.GetExecutingAssembly().GetTypes()
+            // Assumption: All Commands are defined in the same assembly as CommandBase
+            var codeExplorerCommands = Assembly.GetAssembly(typeof(CommandBase)).GetTypes()
                 .Where(type => type.IsClass && type.Namespace != null &&
                                type.CustomAttributes.Any(a => a.AttributeType == typeof(CodeExplorerCommandAttribute)));
             container.Register(Component.For<CodeExplorerViewModel>()