From f26ce60c824ed28e4d471edde94d5c0eea4a6ce2 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 14 Dec 2008 13:12:22 +0000 Subject: [PATCH] Allow startup to continue if some commands fail git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3681 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- src/Main/Base/Project/Src/Commands/AutostartCommands.cs | 6 +++++- src/Main/Core/Project/Src/AddInTree/CoreStartup.cs | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Main/Base/Project/Src/Commands/AutostartCommands.cs b/src/Main/Base/Project/Src/Commands/AutostartCommands.cs index 913737d0dd..6091c2de98 100644 --- a/src/Main/Base/Project/Src/Commands/AutostartCommands.cs +++ b/src/Main/Base/Project/Src/Commands/AutostartCommands.cs @@ -112,7 +112,11 @@ namespace ICSharpCode.SharpDevelop.Commands if (!didLoadSolutionOrFile) { foreach (ICommand command in AddInTree.BuildItems("/Workspace/AutostartNothingLoaded", null, false)) { - command.Run(); + try { + command.Run(); + } catch (Exception ex) { + MessageService.ShowError(ex); + } } } diff --git a/src/Main/Core/Project/Src/AddInTree/CoreStartup.cs b/src/Main/Core/Project/Src/AddInTree/CoreStartup.cs index fe92ad0034..86825bea4a 100644 --- a/src/Main/Core/Project/Src/AddInTree/CoreStartup.cs +++ b/src/Main/Core/Project/Src/AddInTree/CoreStartup.cs @@ -183,7 +183,12 @@ namespace ICSharpCode.Core // run workspace autostart commands LoggingService.Info("Running autostart commands..."); foreach (ICommand command in AddInTree.BuildItems("/Workspace/Autostart", null, false)) { - command.Run(); + try { + command.Run(); + } catch (Exception ex) { + // allow startup to continue if some commands fail + MessageService.ShowError(ex); + } } }