Merge pull request #92 from delahee/master

fixed a recurring NPE when loading swf with dependencies
2014-02-26 07:24:24 -08:00
parent c56e6cafeb a5a26e7753
commit 86a58531fd
1 changed files with 2 additions and 1 deletions
--- a/project/src/common/ExternalInterface.cpp
+++ b/project/src/common/ExternalInterface.cpp
@@ -3234,10 +3234,11 @@ value lime_bitmap_data_from_bytes(value inRGBBytes, value inAlphaBytes)
      return alloc_null();

   Surface *surface = Surface::LoadFromBytes(bytes.data,bytes.length);
-   surface->SetAllowTrans(true);
+   
   
   if (surface)
   {
+      surface->SetAllowTrans(true);	
      if (!val_is_null(inAlphaBytes))
      {
         ByteData alphabytes;