Fixed issue where element becomes unavailable

TomByrne · Aug 15, 2017 · b1fe4f9 · b1fe4f9
1 parent 12c16b1
commit b1fe4f9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/build/Build.bat b/build/Build.bat
@@ -1,5 +1,6 @@
 set /p password=<password.txt
 set /p version=<version.txt
+set timeserver=http://sha1timestamp.ws.symantec.com/sha1/timestamp
 
 del MXI /Q
 del MXI /Q /S
@@ -23,13 +24,13 @@ xcopy /s "..\html\ExtensionContent" HTML
 
 call repl.bat "{version}" "%version%" L < "html-manifest.xml" >"HTML\CSXS\manifest.xml"
 
-tools\ZXPSignCmd -sign HTML "MXI\HTML\org.tbyrne.SvgAnimationForFlash.zxp" cert.p12 %password% -tsa https://timestamp.geotrust.com/tsa
+tools\ZXPSignCmd -sign HTML "MXI\HTML\org.tbyrne.SvgAnimationForFlash.zxp" cert.p12 %password% -tsa %timeserver%
 
 echo f | xcopy "..\bundle\icon.png" "MXI\icon.png" /Y
 
-xcopy "metainfo" MXI
+xcopy "..\build\metainfo" MXI
 call repl.bat "{version}" "%version%" L < "bundle.mxi" >"MXI\org.tbyrne.SvgAnimationForFlash.mxi"
-java -jar tools\ucf.jar -package -storetype PKCS12 -keystore cert.p12 -storepass %password% -tsa https://timestamp.geotrust.com/tsa "../bin/Flash2Svg v%version%.zxp" -C MXI .
+java -jar tools\ucf.jar -package -storetype PKCS12 -keystore cert.p12 -storepass %password% -tsa %timeserver% "../bin/Flash2Svg v%version%.zxp" -C MXI .
 
 
 del MXI /Q

diff --git a/build/version.txt b/build/version.txt
@@ -1 +1 @@
-3.52.0
+3.53.0
diff --git a/html/ExtensionContent/Extensible/SVG.jsfl b/html/ExtensionContent/Extensible/SVG.jsfl
@@ -1603,6 +1603,12 @@
 			var settings=new ext.Object({});
 			settings.extend(options);
 			var result;
+			try{
+				element.matrix; // Trips an error if element is invalid
+			}catch(e){
+				fl.trace("Element is no longer available, skipping");
+				return;
+			}
 			if(element instanceof ext.Instance){
 				if(element.instanceType=='symbol'){
 					result=this._getSymbolInstance(element, settings);