summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-09-07 19:40:23 (GMT)
committerJessica Wagantall <jwagantall@cyngn.com>2016-09-07 19:40:23 (GMT)
commit3511c9d7c958abed41ae7395e458c9aea0e40377 (patch)
treea8324c9f6ad5369dbea7d397cb916fd1a4859b9c
parentbba9df6bdd1563c930ef5bf0d97f52ce355fb4bb (diff)
parentcadfb7a3c96d4fef06656cf37143e1b3e62cae86 (diff)
downloadandroid_external_sonivox-3511c9d7c958abed41ae7395e458c9aea0e40377.zip
android_external_sonivox-3511c9d7c958abed41ae7395e458c9aea0e40377.tar.gz
android_external_sonivox-3511c9d7c958abed41ae7395e458c9aea0e40377.tar.bz2
Merge tag 'android-6.0.1_r66' into HEAD
Android 6.0.1 release 66 # gpg: Signature made Tue 06 Sep 2016 09:26:38 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
-rw-r--r--arm-wt-22k/lib_src/eas_mdls.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arm-wt-22k/lib_src/eas_mdls.c b/arm-wt-22k/lib_src/eas_mdls.c
index a510b80..e1d7849 100644
--- a/arm-wt-22k/lib_src/eas_mdls.c
+++ b/arm-wt-22k/lib_src/eas_mdls.c
@@ -689,8 +689,10 @@ EAS_RESULT DLSParser (EAS_HW_DATA_HANDLE hwInstData, EAS_FILE_HANDLE fileHandle,
}
/* create the default articulation */
- Convert_art(&dls, &defaultArt, 0);
- dls.artCount = 1;
+ if (dls.pDLS) {
+ Convert_art(&dls, &defaultArt, 0);
+ dls.artCount = 1;
+ }
/* parse the lins chunk and load instruments */
dls.regionCount = dls.instCount = 0;