Merge branch 'master' of https://github.com/aduros/flambe into rotati…

…on-cache
aduros · Jan 23, 2015 · 45e2be4 · 45e2be4
2 parents 42c4e20 + fc2ce24
commit 45e2be4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/command/index.js b/command/index.js
@@ -165,7 +165,7 @@ exports.build = function (config, platforms, opts) {
 
     var swfFlags = function (air) {
         // Flags common to all swf-based targets (flash, android, ios)
-        var flags = ["--flash-strict", "-swf-header", "640:480:60:000000"];
+        var flags = ["--flash-strict", "-swf-header", get(config, "width", "640")+":"+get(config, "height", "480")+":"+get(config, "framerate", "60")+":000000"];
         if (debug) flags.push("-D", "fdb", "-D", "advanced-telemetry");
         else flags.push("-D", "native_trace");
 

diff --git a/src/flambe/display/Sprite.hx b/src/flambe/display/Sprite.hx
@@ -566,8 +566,10 @@ class Sprite extends Component
                 _pointerOut.emit(event);
             }
             _flags = _flags.remove(HOVERING);
-            _hoverConnection.dispose();
-            _hoverConnection = null;
+            if (_hoverConnection != null) {            
+                _hoverConnection.dispose();
+                _hoverConnection = null;
+            }
         });
     }