Fix #328490

[mono.git] / mcs / class / System / System.ComponentModel / AsyncOperationManager.cs

diff --git a/mcs/class/System/System.ComponentModel/AsyncOperationManager.cs b/mcs/class/System/System.ComponentModel/AsyncOperationManager.cs
index 2e98372d236acc65867bf0f7fd95d193f683c289..736788456c2f7e4f120721d876275c171a0de5b5 100644 (file)
--- a/mcs/class/System/System.ComponentModel/AsyncOperationManager.cs
+++ b/mcs/class/System/System.ComponentModel/AsyncOperationManager.cs
@@ -35,25 +35,26 @@ namespace System.ComponentModel
 {
        public static class AsyncOperationManager
        {
-               static readonly SynchronizationContext default_context;
-               static SynchronizationContext current_context;
-
                static AsyncOperationManager ()
                {
-                       default_context = new SynchronizationContext ();
-                       current_context = default_context;
                }
 
+               [EditorBrowsable (EditorBrowsableState.Advanced)]
                public static SynchronizationContext SynchronizationContext {
-                       get { return current_context; }
+                       get { 
+                               if (SynchronizationContext.Current == null)
+                                       SynchronizationContext.SetSynchronizationContext (new SynchronizationContext ());
+                               
+                               return SynchronizationContext.Current;
+                       }
                        [SecurityPermission (SecurityAction.LinkDemand)]
-                       set { current_context = value != null ? value : default_context; }
+                       set { SynchronizationContext.SetSynchronizationContext (value); }
                }
 
                public static AsyncOperation CreateOperation (object userSuppliedState)
                {
                        return new AsyncOperation (
-                               current_context, userSuppliedState);
+                               SynchronizationContext, userSuppliedState);
                }
        }
 }