Merge branch 'develop' into 8.3.0-Dev

This commit is contained in:
Josh Tynjala
2025-01-10 15:08:32 -08:00
7 changed files with 24 additions and 11 deletions

View File

@@ -167,7 +167,7 @@ class FlashHelper
var frameData = frameDataWriter.getBytes();
var snd:format.swf.Sound =
var snd:format.swf.Data.Sound =
{
sid: cid,
format: SFMP3,
@@ -255,7 +255,7 @@ class FlashHelper
{
var sampleCount = Std.int(wav.data.length / (hdr.bitsPerSample / 8));
var snd:format.swf.Sound =
var snd:format.swf.Data.Sound =
{
sid: cid,
format: SFLittleEndianUncompressed,

View File

@@ -26,9 +26,9 @@ class Keystore
if (keystore != null)
{
if (keystore.path != null && keystore.path != "") path = keystore.path;
if (keystore.password != null) path = keystore.password;
if (keystore.alias != null) path = keystore.alias;
if (keystore.aliasPassword != null) path = keystore.aliasPassword;
if (keystore.password != null) password = keystore.password;
if (keystore.alias != null) alias = keystore.alias;
if (keystore.aliasPassword != null) aliasPassword = keystore.aliasPassword;
}
}
}