gui: fix decompilation task on search (#235)

This commit is contained in:
Skylot
2018-03-29 20:41:05 +03:00
parent 15e1e1dfab
commit ea01102f1d
2 changed files with 13 additions and 4 deletions
@@ -1,5 +1,6 @@
package jadx.gui.jobs;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@@ -38,10 +39,13 @@ public abstract class BackgroundJob {
private class ShutdownTask extends FutureTask<Boolean> {
public ShutdownTask() {
super(() -> {
runJob();
executor.shutdown();
return executor.awaitTermination(1, TimeUnit.HOURS);
super(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
runJob();
executor.shutdown();
return executor.awaitTermination(5, TimeUnit.MINUTES);
}
});
}
@@ -462,6 +462,11 @@ public abstract class CommonSearchDialog extends JDialog {
@Override
public void done() {
try {
get();
} catch (Exception e) {
LOG.error("Load task failed", e);
}
loadFinishedCommon();
loadFinished();
}