Fix #401: SD fails to start when using "load previous solution on startup" and the solution load fails with an unhandled exception.

dgrunwald · dgrunwald · commit 19017ee08102 · 2014-03-14T14:40:40.000+01:00
diff --git a/src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs b/src/Main/SharpDevelop/Workbench/WorkbenchStartup.cs
@@ -132,8 +132,12 @@ public void Run(IList<string> fileList)
 			// load previous solution
 			if (!didLoadSolutionOrFile && SD.PropertyService.Get("SharpDevelop.LoadPrevProjectOnStartup", false)) {
 				if (SD.FileService.RecentOpen.RecentProjects.Count > 0) {
-					SD.ProjectService.OpenSolutionOrProject(SD.FileService.RecentOpen.RecentProjects[0]);
-					didLoadSolutionOrFile = true;
+					try {
+						SD.ProjectService.OpenSolutionOrProject(SD.FileService.RecentOpen.RecentProjects[0]);
+						didLoadSolutionOrFile = true;
+					} catch (Exception ex) {
+						MessageService.ShowException(ex);
+					}
 				}
 			}
 			

Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,12 @@ public void Run(IList<string> fileList)`
`132`	`132`	`// load previous solution`
`133`	`133`	`if (!didLoadSolutionOrFile && SD.PropertyService.Get("SharpDevelop.LoadPrevProjectOnStartup", false)) {`
`134`	`134`	`if (SD.FileService.RecentOpen.RecentProjects.Count > 0) {`
`135`		`- SD.ProjectService.OpenSolutionOrProject(SD.FileService.RecentOpen.RecentProjects[0]);`
`136`		`- didLoadSolutionOrFile = true;`
	`135`	`+ try {`
	`136`	`+ SD.ProjectService.OpenSolutionOrProject(SD.FileService.RecentOpen.RecentProjects[0]);`
	`137`	`+ didLoadSolutionOrFile = true;`
	`138`	`+ } catch (Exception ex) {`
	`139`	`+ MessageService.ShowException(ex);`
	`140`	`+ }`
`137`	`141`	`}`
`138`	`142`	`}`
`139`	`143`