From b30f02fdf1716a819444e0c8e01e5a86ac2c36b4 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Mon, 28 Jan 2008 19:32:25 +0000
Subject: [PATCH] Fixed build.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2934 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../ClassCanvas/Src/ClassCanvasItem.cs        | 12 +-----------
 .../ClassDiagram/ClassEditor/ClassEditor.cs   | 13 +------------
 .../AmbienceService/AmbienceService.cs        | 19 ++++++++++++++-----
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/Src/ClassCanvasItem.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/Src/ClassCanvasItem.cs
index 8fa8f6fa28..0558be996d 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/Src/ClassCanvasItem.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/Src/ClassCanvasItem.cs
@@ -259,17 +259,7 @@ namespace ClassDiagram
 		
 		protected IAmbience GetAmbience()
 		{
-			IAmbience ambience = null;
-			
-			try
-			{
-				ambience = AmbienceService.CurrentAmbience;
-			}
-			catch (NullReferenceException)
-			{
-				ambience = ICSharpCode.SharpDevelop.Dom.CSharp.CSharpAmbience.Instance;
-			}
-			
+			IAmbience ambience = AmbienceService.CurrentAmbience;
 			ambience.ConversionFlags = ConversionFlags.None;
 			return ambience;
 		}
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassEditor/ClassEditor.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassEditor/ClassEditor.cs
index 524d05b308..121ba1f07f 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassEditor/ClassEditor.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassEditor/ClassEditor.cs
@@ -489,19 +489,8 @@ namespace ClassDiagram
 		
 		protected IAmbience GetAmbience()
 		{
-			IAmbience ambience = null;
-			
-			try
-			{
-				ambience = AmbienceService.CurrentAmbience;
-			}
-			catch (NullReferenceException)
-			{
-				ambience = ICSharpCode.SharpDevelop.Dom.CSharp.CSharpAmbience.Instance;
-			}
-			
+			IAmbience ambience = AmbienceService.CurrentAmbience;
 			ambience.ConversionFlags = ConversionFlags.None;
-			
 			return ambience;
 		}
 		
diff --git a/src/Main/Base/Project/Src/Services/AmbienceService/AmbienceService.cs b/src/Main/Base/Project/Src/Services/AmbienceService/AmbienceService.cs
index d723f2dfc1..b9025c0a50 100644
--- a/src/Main/Base/Project/Src/Services/AmbienceService/AmbienceService.cs
+++ b/src/Main/Base/Project/Src/Services/AmbienceService/AmbienceService.cs
@@ -33,7 +33,7 @@ namespace ICSharpCode.SharpDevelop
 		static List<CodeGenerator> codeGenerators = new List<CodeGenerator>();
 		
 		static void ApplyCodeGenerationProperties(CodeGenerator generator)
-		{			
+		{
 			CodeGeneratorOptions options = generator.Options;
 			System.CodeDom.Compiler.CodeGeneratorOptions cdo = new CodeDOMGeneratorUtility().CreateCodeGeneratorOptions;
 			
@@ -79,18 +79,28 @@ namespace ICSharpCode.SharpDevelop
 		
 		public static IAmbience CurrentAmbience {
 			get {
+				Gui.WorkbenchSingleton.AssertMainThread();
+				
+				IAmbience ambience;
 				if (UseProjectAmbienceIfPossible) {
 					ICSharpCode.SharpDevelop.Project.IProject p = ICSharpCode.SharpDevelop.Project.ProjectService.CurrentProject;
 					if (p != null) {
-						return p.GetAmbience();
+						ambience = p.GetAmbience();
+						if (ambience != null)
+							return ambience;
 					}
 				}
 				if (defaultAmbience == null) {
 					string language = DefaultAmbienceName;
-					defaultAmbience = (IAmbience)AddInTree.BuildItem("/SharpDevelop/Workbench/Ambiences/" + language, null);
-					if (defaultAmbience == null) {
+					try {
+						ambience = (IAmbience)AddInTree.BuildItem("/SharpDevelop/Workbench/Ambiences/" + language, null);
+					} catch (TreePathNotFoundException) {
+						ambience = null;
+					}
+					if (ambience == null && Gui.WorkbenchSingleton.MainForm != null) {
 						MessageService.ShowError("${res:ICSharpCode.SharpDevelop.Services.AmbienceService.AmbienceNotFoundError}");
 					}
+					defaultAmbience = ambience ?? new NetAmbience();
 				}
 				return defaultAmbience;
 			}
@@ -108,7 +118,6 @@ namespace ICSharpCode.SharpDevelop
 		static void PropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
 			if (e.Key == ambienceProperty) {
-				defaultAmbience = null;
 				OnAmbienceChanged(EventArgs.Empty);
 			}
 			if (e.Key == codeGenerationProperty) {