Merge branch 'BigIntegerParse'

[mono.git] / mcs / class / corlib / System.Runtime.CompilerServices / TaskAwaiter.cs

diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/TaskAwaiter.cs b/mcs/class/corlib/System.Runtime.CompilerServices/TaskAwaiter.cs
index f122e81585e7e26d6e51d19b8fe0b46c79d341c3..80b64cb56e841ac167288eb742725eca27a91d6b 100644 (file)
--- a/mcs/class/corlib/System.Runtime.CompilerServices/TaskAwaiter.cs
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/TaskAwaiter.cs
@@ -78,18 +78,18 @@ namespace System.Runtime.CompilerServices
 
                internal static void HandleOnCompleted (Task task, Action continuation, bool continueOnSourceContext, bool manageContext)
                {
-                       if (continueOnSourceContext && SynchronizationContext.Current != null) {
+                       if (continueOnSourceContext && SynchronizationContext.Current != null && SynchronizationContext.Current.GetType () != typeof (SynchronizationContext)) {
                                task.ContinueWith (new SynchronizationContextContinuation (continuation, SynchronizationContext.Current));
                        } else {
                                IContinuation cont;
                                Task cont_task;
-                               if (continueOnSourceContext && TaskScheduler.Current != TaskScheduler.Default) {
+                               if (continueOnSourceContext && !TaskScheduler.IsDefault) {
                                        cont_task = new Task (TaskActionInvoker.Create (continuation), null, CancellationToken.None, TaskCreationOptions.None, null);
                                        cont_task.SetupScheduler (TaskScheduler.Current);
                                        cont = new SchedulerAwaitContinuation (cont_task);
                                } else {
                                        cont_task = null;
-                                       cont = new ActionContinuation (continuation);
+                                       cont = new AwaiterActionContinuation (continuation);
                                }
 
                                //
@@ -104,7 +104,7 @@ namespace System.Runtime.CompilerServices
                                        cont_task.SetupScheduler (TaskScheduler.Current);
                                }
 
-                               cont_task.Schedule ();
+                               cont_task.Schedule (true);
                        }
                }