Check whether the payload type is Event

Actionscript3Commons · Nov 18, 2010 · 82f91d3 · 82f91d3
1 parent 8b48517
commit 82f91d3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/org/robotlegs/base/CommandMap.as b/src/org/robotlegs/base/CommandMap.as
@@ -162,15 +162,20 @@ package org.robotlegs.base
 			if (payload != null || payloadClass != null)
 			{
 				payloadClass ||= reflector.getClass(payload);
-				injector.mapValue(Event, payload as Event, named);
+
+				if (payload is Event && payloadClass != Event)
+					injector.mapValue(Event, payload, named);
+
 				injector.mapValue(payloadClass, payload, named);
 			}
 
 			var command:Object = injector.instantiate(commandClass);
 
 			if (payload !== null || payloadClass != null)
 			{
-				injector.unmap(Event, named);
+				if (payload is Event && payloadClass != Event)
+					injector.unmap(Event, named);
+
 				injector.unmap(payloadClass, named);
 			}