Merge origin/master

This commit is contained in:
honfika@gmail.com
2015-05-25 09:10:10 +02:00
2 changed files with 5 additions and 0 deletions

View File

@@ -421,6 +421,9 @@ public abstract class Tag implements NeedsCharacters, Exportable, Serializable {
public void undo() throws InterruptedException, IOException {
byte[] data = getOriginalData();
if (data == null) { //If the tag is newly created in GUI it has no original data
return;
}
SWFInputStream tagDataStream = new SWFInputStream(swf, data, getDataPos(), data.length);
readData(tagDataStream, getOriginalRange(), 0, false, true, false);
setModified(false);