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

Fixed: Stop run process hang

Browse Source
This commit is contained in:
Jindra Petřík
2024-11-10 19:50:55 +01:00
parent 497b5b5018
commit 1ae56728ee
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/Main.java
+19 -17
View File
@@ -196,7 +196,7 @@ public class Main {
private static File runTempFile;
private static CookiesChangedListener runCookieListener;
private static List<File> runTempFiles = new ArrayList<>();
private static WatchService watcher;
@@ -660,23 +660,26 @@ public class Main {
runPlayer(AppStrings.translate("work.running"), playerLocation, tempFile.getAbsolutePath(), flashVars);
}
}
private static void deleteCookiesAfterRun(File tempFile) {
SharedObjectsStorage.removeChangedListener(tempFile, runCookieListener);
File solDir = SharedObjectsStorage.getSolDirectoryForLocalFile(tempFile);
if (solDir == null) {
return;
}
if (solDir.exists()) {
for (File f : solDir.listFiles()) {
f.delete();
View.execInEventDispatchLater(new Runnable() {
public void run() {
File solDir = SharedObjectsStorage.getSolDirectoryForLocalFile(tempFile);
if (solDir == null) {
return;
}
if (solDir.exists()) {
for (File f : solDir.listFiles()) {
f.delete();
}
solDir.delete();
}
}
solDir.delete();
}
});
synchronized (Main.class) {
runCookieListener = null;
}
getMainFrame().getPanel().refreshTree();
}
private static void prepareCookiesForRun(File tempFile, SWF swf) {
@@ -701,7 +704,7 @@ public class Main {
}
}
}
runCookieListener = new CookiesChangedListener() {
@Override
public void cookiesChanged(File swfFile, List<File> cookies) {
@@ -725,7 +728,7 @@ public class Main {
}
}
};
SharedObjectsStorage.addChangedListener(tempFile,runCookieListener);
SharedObjectsStorage.addChangedListener(tempFile, runCookieListener);
}
public static void runDebug(SWF swf, final boolean doPCode) {
@@ -2496,7 +2499,6 @@ public class Main {
} catch (IOException ex) {
//ignore
}
if (watcher != null) {
watcherWorker = new SwingWorker() {
@@ -2573,9 +2575,9 @@ public class Main {
boolean valid = key.reset();
if (!valid) {
SharedObjectsStorage.watchedCookieDirectories.remove(key);
watchedDirectories.remove(key);
watchedDirectories.remove(key);
}
}
}
}
};
watcherWorker.execute();