Merge pull request #609 from IbraheemOsama/AwaitableRunAsyncBug

deltakosh · web-flow · commit c99b1d19bf69 · 2016-11-11T13:54:25.000-08:00
Fixing Dispatcher.AwaitableRunAsync Null problem
diff --git a/Microsoft.Toolkit.Uwp/Helpers/DispatcherHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/DispatcherHelper.cs
@@ -165,7 +165,16 @@ public static Task<T> AwaitableRunAsync<T>(this CoreDispatcher dispatcher, Func<
              {
                  try
                  {
-                     taskCompletionSource.SetResult(await function().ConfigureAwait(false));
+                     var awaitableResult = function();
+                     if (awaitableResult != null)
+                     {
+                         var result = await awaitableResult.ConfigureAwait(false);
+                         taskCompletionSource.SetResult(result);
+                     }
+                     else
+                     {
+                         taskCompletionSource.SetResult(default(T));
+                     }
                  }
                  catch (Exception e)
                  {

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,16 @@ public static Task<T> AwaitableRunAsync<T>(this CoreDispatcher dispatcher, Func<`
`165`	`165`	`{`
`166`	`166`	`try`
`167`	`167`	`{`
`168`		`- taskCompletionSource.SetResult(await function().ConfigureAwait(false));`
	`168`	`+ var awaitableResult = function();`
	`169`	`+ if (awaitableResult != null)`
	`170`	`+ {`
	`171`	`+ var result = await awaitableResult.ConfigureAwait(false);`
	`172`	`+ taskCompletionSource.SetResult(result);`
	`173`	`+ }`
	`174`	`+ else`
	`175`	`+ {`
	`176`	`+ taskCompletionSource.SetResult(default(T));`
	`177`	`+ }`
`169`	`178`	`}`
`170`	`179`	`catch (Exception e)`
`171`	`180`	`{`