LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 14:30:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1236 ffdec won't open fix?

Browse Source
This commit is contained in:
[email protected]
2016-06-15 23:06:14 +02:00
parent 9b831b200e
commit 6f60765424
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java
+15 -2
View File
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.gui.player;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.gui.FlashUnsupportedException;
import com.jpexs.decompiler.flash.gui.Main;
import com.jpexs.helpers.CancellableWorker;
import com.jpexs.javactivex.ActiveX;
import com.jpexs.javactivex.ActiveXEvent;
import com.jpexs.javactivex.ActiveXException;
@@ -38,6 +39,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -160,8 +165,16 @@ public final class FlashPlayerPanel extends Panel implements Closeable, MediaDis
}
try {
flash = ActiveX.createObject(ShockwaveFlash.class, this);
} catch (ActiveXException ex) {
Callable<ShockwaveFlash> callable = new Callable<ShockwaveFlash>() {
@Override
public ShockwaveFlash call() throws InterruptedException {
return ActiveX.createObject(ShockwaveFlash.class, FlashPlayerPanel.this);
}
};
// hack: Kernel32.INSTANCE.ConnectNamedPipe never completes in AciveXControl static constructor
flash = CancellableWorker.call(callable, 5, TimeUnit.SECONDS);
} catch (ActiveXException | TimeoutException | InterruptedException | ExecutionException ex) {
throw new FlashUnsupportedException();
}