Merge pull request #4 from Juce-Assets/develop

Dev to stable
Juce-Assets · Nov 18, 2020 · ff11123 · ff11123
2 parents 04a50fd + 14b5c9f
commit ff11123
Show file tree

Hide file tree

Showing 94 changed files with 18,619 additions and 16,938 deletions.
diff --git a/Editor/Feedbacks/FeedbacksPlayerCE.cs b/Editor/Feedbacks/FeedbacksPlayerCE.cs
@@ -80,6 +80,11 @@ private void DrawFeedbacksSection()
             {
                 Feedback currFeedback = feedbacksProperty.GetArrayElementAtIndex(i).objectReferenceValue as Feedback;
 
+                if (currFeedback == null)
+                {
+                    continue;
+                }
+
                 FeedbackEditorData feedbackEditorData = GetOrCreateFeedbackeEditor(currFeedback);
 
                 DrawFeedback(feedbackEditorData, i, e);
@@ -584,7 +589,7 @@ private void TryRepareFeedbacks()
                 {
                     Debug.LogError($"{nameof(Feedback)} is null and could not be repared");
 
-                    RemoveFeedback(currFeedback);
+                    continue;
                 }
 
                 bool needsToBeRecreated = currFeedback.gameObject == null;
@@ -630,6 +635,11 @@ private FeedbackEditorData GetOrCreateFeedbackeEditor(Feedback feedback)
 
         private void RemoveFeedbackEditor(Feedback feedback)
         {
+            if (feedback == null)
+            {
+                return;
+            }
+
             cachedEditorFeedback.Remove(feedback);
         }