Prevent iterating null children. Fixes issue #146.

2d-inc · Sep 4, 2019 · 2c078c1 · 2c078c1
1 parent 798ec8d
commit 2c078c1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/flare_dart/CHANGELOG.md b/flare_dart/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.4.6] - 2019-09-04 08:48:11
+
+- Prevent iterating null children. Fixes issue #146.
+
 ## [1.4.5] - 2019-08-23 09:51:30
 
 Small changes to fix warnings caught by the Dart static analyzer.

diff --git a/flare_dart/lib/actor_node.dart b/flare_dart/lib/actor_node.dart
@@ -378,12 +378,14 @@ class ActorNode extends ActorComponent {
       return false;
     }
 
-    for (ActorNode child in _children) {
-      if (cb(child) == false) {
-        return false;
-      }
+    if (_children != null) {
+      for (final ActorNode child in _children) {
+        if (cb(child) == false) {
+          return false;
+        }
 
-      child.eachChildRecursive(cb);
+        child.eachChildRecursive(cb);
+      }
     }
 
     return true;

diff --git a/flare_dart/pubspec.yaml b/flare_dart/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flare_dart
 description: Vector design and runtime animation.
-version: 1.4.5
+version: 1.4.6
 author: "2Dimensions Team <[email protected]>"
 homepage: https://github.com/2d-inc/Flare-Flutter
 environment:

diff --git a/flare_flutter/CHANGELOG.md b/flare_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.5.8] - 2019-09-04 08:47:31
+
+- Bump flare_dart dependency version to get fix for iterating null children. Issue #146.
+
 ## [1.5.7] - 2019-08-26 10:39:49
 
 - Clip the artboard based on settings from Flare.

diff --git a/flare_flutter/pubspec.yaml b/flare_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flare_flutter
 description: Vector design and runtime animation for Flutter.
-version: 1.5.7
+version: 1.5.8
 author: "2Dimensions Team <[email protected]>"
 homepage: https://github.com/2d-inc/Flare-Flutter
 environment: