Return proper result from execute on ui

Vadi · Dec 14, 2011 · 6719014 · 6719014
1 parent 29d0fa4
commit 6719014
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Raven.Studio/Infrastructure/Execute.cs b/Raven.Studio/Infrastructure/Execute.cs
@@ -17,18 +17,25 @@ public static Task OnTheUI(Action action)
 			if (Deployment.Current.Dispatcher.CheckAccess())
 			{
 				action();
-				return null;
+				return EmptyResult<object>();
 			}
 			return Deployment.Current.Dispatcher.InvokeAsync(action)
 				.Catch();
 		}
 
+		private static Task<T> EmptyResult<T>()
+		{
+			var tcs = new TaskCompletionSource<T>();
+			tcs.SetResult(default(T));
+			return tcs.Task;
+		}
+
 		public static Task<TResult> OnTheUI<TResult>(Func<TResult> action)
 		{
 			if (Deployment.Current.Dispatcher.CheckAccess())
 			{
 				action();
-				return null;
+				return EmptyResult<TResult>();
 			}
 			return Deployment.Current.Dispatcher.InvokeAsync(action)
 				.Catch();