Merge pull request #503 from dr-BEat/master

Correctly handle ServiceCreatorCallback in GetFutureService

src/Main/Base/Project/Util/SharpDevelopServiceContainer.cs

@@ -161,9 +161,8 @@ namespace ICSharpCode.SharpDevelop
 		{
 			Type serviceType = typeof(T);
 			lock (services) {
-				object instance;
+				if (services.ContainsKey(serviceType)) {
-				if (services.TryGetValue(serviceType, out instance)) {
+					return Task.FromResult((T)GetService(serviceType));
-					return Task.FromResult((T)instance);
 				} else {
 					object taskCompletionSource;
 					if (taskCompletionSources.TryGetValue(serviceType, out taskCompletionSource)) {