Merge pull request #5 from trevoriancox/master

Issues 1 & 3 alternate fix: allow explicit setting of SyncContext.
newky2k · Jan 16, 2017 · bd2263b · bd2263b
2 parents b681eba + 923be3a
commit bd2263b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/src/MessageBus/DSoft.Messaging/DSoft.Messaging.csproj b/src/MessageBus/DSoft.Messaging/DSoft.Messaging.csproj
@@ -11,8 +11,6 @@
     <TargetFrameworkProfile>Profile158</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <ReleaseVersion>1.3</ReleaseVersion>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/src/MessageBus/DSoft.Messaging/MessageBus.cs b/src/MessageBus/DSoft.Messaging/MessageBus.cs
@@ -24,8 +24,6 @@ public class MessageBus
 
 		public MessageBus()
 		{
-			var aSyncContext = TaskScheduler.FromCurrentSynchronizationContext();
-
 		}
 
 		#endregion
@@ -69,10 +67,10 @@ internal MessageBusEventHandlerCollection EventHandlers {
 		}
 
 		/// <summary>
-		/// Gets or sets the sync context.
+		/// Gets or sets the sync context for the UI thread.
 		/// </summary>
 		/// <value>The sync context.</value>
-		private TaskScheduler SyncContext
+		public TaskScheduler SyncContext
 		{
 			get;
 			set;
@@ -166,11 +164,7 @@ public void DeRegister<T> (Action<object,MessageBusEvent> Action) where T : Mess
 
 		private void Execute (Action<object,MessageBusEvent> Action, object Sender, MessageBusEvent Evnt)
 		{
-			Task.Factory.StartNew (() => {
-				Action (Sender, Evnt);
-			}, 
-				CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default);
-
+            Action(Sender, Evnt);
 		}
 
 		/// <summary>
@@ -287,9 +281,10 @@ public static void PostEvent (String EventId, object Sender, object[] Data)
 		/// <param name="Command">Command.</param>
 		public void RunOnUiThread(Action Command)
 		{
-			var cul = Thread.CurrentThread;
+            if (SyncContext == null)
+                throw new ArgumentNullException ("SyncContext");
 
-			//update the UI
+            //update the UI
 			Task.Factory.StartNew(() =>
 			{
 				if (Command != null)