fix #67, minor fixes

Author: jackbrookes

Assets/Testing/AWS1HourTest.unity

@@ -1203,7 +1203,7 @@ PrefabInstance:
     - target: {fileID: 2834388984357925155, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 1105
+      value: 1235
       objectReference: {fileID: 0}
     - target: {fileID: 2896031059644693069, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
@@ -1253,7 +1253,7 @@ PrefabInstance:
     - target: {fileID: 4267567203292169432, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 2040
+      value: 2280
       objectReference: {fileID: 0}
     - target: {fileID: 4612929069887686480, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}

Assets/UXF/Prefabs/Form.meta

@@ -73,7 +73,10 @@ static void FetchReferences()
                     Dictionary<string, object> trialDict = new Dictionary<string, object>();
                     // log each trial setting
                     foreach (string key in trial.settings.Keys)
-                        trialDict.Add(key, trial.settings.GetObject(key).ToString());
+                    {
+                        var val = trial.settings.GetObject(key);
+                        trialDict.Add(key, val?.ToString() ?? "(null)");
+                    }
 
                     // add trial to block
                     trialList.Add(trialDict);

Assets/UXF/Scripts/Etc/Editor/UXFSessionDisplay.cs

@@ -101,7 +101,15 @@ public void AddProperty(SerializedProperty property)
 
 				propList.drawElementCallback = delegate (Rect rect, int index, bool active, bool focused)
 				{
-					SerializedProperty targetElement = property.GetArrayElementAtIndex(index);
+					SerializedProperty targetElement;
+					try
+					{
+						targetElement = property.GetArrayElementAtIndex(index);
+					}
+					catch (NullReferenceException)
+					{
+						return;
+					}
 
 					bool isExpanded = targetElement.isExpanded;
 					rect.height = EditorGUI.GetPropertyHeight(targetElement, GUIContent.none, isExpanded);
@@ -148,7 +156,15 @@ public void AddProperty(SerializedProperty property)
 
 			private float ElementHeightCallback(SerializedProperty property, int index)
 			{
-				SerializedProperty arrayElement = property.GetArrayElementAtIndex(index);
+				SerializedProperty arrayElement;
+				try
+				{
+					arrayElement = property.GetArrayElementAtIndex(index);
+				}
+				catch (NullReferenceException)
+				{
+					return 0f;
+				}
 				float calculatedHeight = EditorGUI.GetPropertyHeight(arrayElement,
 																	GUIContent.none,
 																	arrayElement.isExpanded);
@@ -319,7 +335,9 @@ protected virtual void InitInspector()
 			if (isInitialized && FORCE_INIT == false)
 				return;
 
-			styleEditBox = new GUIStyle(EditorStyles.helpBox) { padding = new RectOffset(5, 5, 5, 5) };
+			try { styleEditBox = new GUIStyle(EditorStyles.helpBox) { padding = new RectOffset(5, 5, 5, 5) }; }
+			catch (NullReferenceException) { return; }
+			
 			FindTargetProperties();
 			FindContextMenu();
 		}
@@ -612,7 +630,11 @@ public override void OnInspectorGUI()
 
 			if (EditorGUI.EndChangeCheck())
 			{
-				serializedObject.ApplyModifiedProperties();
+				try
+				{
+					serializedObject.ApplyModifiedProperties();
+				}
+				catch (System.Exception) { return; }
 				InitInspector(true);
 			}
 
@@ -630,27 +652,34 @@ protected void IterateDrawProperty(SerializedProperty property, Func<IterControl
 		{
 			if (property.NextVisible(true))
 			{
-				// Remember depth iteration started from
-				int depth = property.Copy().depth;
-				do
+				try
 				{
-					// If goes deeper than the iteration depth, get out
-					if (property.depth != depth)
-						break;
-					if (isSubEditor && property.name.Equals("m_Script"))
-						continue;
-
-					if (filter != null)
+					// Remember depth iteration started from
+					int depth = property.Copy().depth;
+					do
 					{
-						var filterResult = filter();
-						if (filterResult == IterControl.Break)
+						// If goes deeper than the iteration depth, get out
+						if (property.depth != depth)
 							break;
-						if (filterResult == IterControl.Continue)
+						if (isSubEditor && property.name.Equals("m_Script"))
 							continue;
-					}
 
-					DrawPropertySortableArray(property);
-				} while (property.NextVisible(false));
+						if (filter != null)
+						{
+							var filterResult = filter();
+							if (filterResult == IterControl.Break)
+								break;
+							if (filterResult == IterControl.Continue)
+								continue;
+						}
+
+						DrawPropertySortableArray(property);
+					} while (property == null || property.NextVisible(false));
+				}
+				catch (NullReferenceException) 
+				{
+					return;
+				}
 			}
 		}
 

Assets/UXF/Scripts/Etc/ReorderableInspector/Editor/ReorderableArrayInspector.cs

@@ -144,7 +144,7 @@ public void End()
             // log any settings we need to for this trial
             foreach (string s in session.settingsToLog)
             {
-                result[s] = settings.GetObject(s);
+                result[s] = settings.GetObject(s, string.Empty);
             }
 
             session.onTrialEnd.Invoke(this);

Assets/UXF/Scripts/Etc/Trial.cs

@@ -1 +1 @@
-2.1.2
+2.1.3