Browse Source

Merge pull request #1382 from AtomicGameEngine/JME-ATOMIC-FIXSCRIPTEVENT

Add a check for null native event (in the case of a script event)
JoshEngebretson 9 years ago
parent
commit
2f3c7a20aa
1 changed files with 5 additions and 1 deletions
  1. 5 1
      Script/AtomicNET/AtomicNET/Core/NativeCore.cs

+ 5 - 1
Script/AtomicNET/AtomicNET/Core/NativeCore.cs

@@ -204,7 +204,11 @@ namespace AtomicEngine
                     scriptMap = svm[svmDepth++];
                     scriptMap = svm[svmDepth++];
                     scriptMap.CopyVariantMap(eventData);
                     scriptMap.CopyVariantMap(eventData);
                     nativeEventData = NativeEvents.GetNativeEventData(eventType, scriptMap);
                     nativeEventData = NativeEvents.GetNativeEventData(eventType, scriptMap);
-                    nativeEventData.sourceEventData = eventData;
+
+                    // This check can be removed once ATOMIC-1381 is resolved
+                    // https://github.com/AtomicGameEngine/AtomicGameEngine/issues/1381
+                    if (nativeEventData != null)
+                        nativeEventData.sourceEventData = eventData;
                 }
                 }
 
 
                 receiver.HandleEvent(eventType, scriptMap, nativeEventData);
                 receiver.HandleEvent(eventType, scriptMap, nativeEventData);