scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 15:02:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2278 from fsih/warnMsg

Browse source 
Move error log to right place
This commit is contained in:
DD Liu 2019-09-16 14:44:06 -04:00 committed by GitHub
commit 1dc2e3ff2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/import/load-costume.js
View file

@ -171,8 +171,7 @@ const fetchBitmapCanvas_ = function (costume, runtime, rotationCenter) {
assetMatchesBase: scale === 1 && !textImageElement assetMatchesBase: scale === 1 && !textImageElement
}; };
}) })
.catch(error => { .catch(() => {
log.warn(`${error.name}: ${error.message}`);
// Clean up the text layer properties if it fails to load // Clean up the text layer properties if it fails to load
delete costume.textLayerMD5; delete costume.textLayerMD5;
delete costume.textLayerAsset; delete costume.textLayerAsset;
@ -261,7 +260,8 @@ const loadCostumeFromAsset = function (costume, runtime, optVersion) {
} }
if (costume.asset.assetType.runtimeFormat === AssetType.ImageVector.runtimeFormat) { if (costume.asset.assetType.runtimeFormat === AssetType.ImageVector.runtimeFormat) {
return loadVector_(costume, runtime, rotationCenter, optVersion) return loadVector_(costume, runtime, rotationCenter, optVersion)
.catch(() => { .catch(error => {
log.warn(`Error loading vector image: ${error.name}: ${error.message}`);
// Use default asset if original fails to load // Use default asset if original fails to load
costume.assetId = runtime.storage.defaultAssetId.ImageVector; costume.assetId = runtime.storage.defaultAssetId.ImageVector;
costume.asset = runtime.storage.get(costume.assetId); costume.asset = runtime.storage.get(costume.assetId);