cleanup

Author: jackbrookes

Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_ReactionTask.cs

@@ -22,6 +22,9 @@ public void StartReactionTaskTrial(Trial trial)
 
 		public void EndReactionTaskTrial(Trial trial)
 		{
+			// sometimes we quit the application mid session, and that ends the current trial. If that is the case, we don't need to do anything here. 
+			if (Session.instance.isEnding) return;
+
             // show some feedback
 			string outcomeText = (string) trial.result["outcome"];
 			float rt = (float) trial.result["reaction_time"];

Assets/UXF/Scripts/Session.cs

@@ -115,6 +115,11 @@ public class Session : MonoBehaviour, ISettingsContainer, IDataAssociatable
         [Tooltip("Event(s) to trigger when the session has ended and all jobs have finished. It is safe to quit the application beyond this event")]
         public SessionEvent onSessionEnd = new SessionEvent();
 
+        /// <summary>
+        /// Returns true when the session is in the process of ending. It is useful to query this in On Trial End events, since you may not need to perform some behaviour if the session is ending.
+        /// </summary>
+        /// <value></value>
+        public bool isEnding { get; private set; } = false;
 
         [SerializeField]
         private bool _hasInitialised = false;
@@ -600,6 +605,7 @@ public void End()
         {
             if (hasInitialised)
             {
+                isEnding = true;
                 if (InTrial)
                     CurrentTrial.End();
                 SaveResults();
@@ -618,6 +624,7 @@ public void End()
                 _hasInitialised = false;
 
                 Debug.Log("Ended session.");
+                isEnding = false;
             }
         }