Commit ea01102f authored by Skylot's avatar Skylot

gui: fix decompilation task on search (#235)

parent 15e1e1df
package jadx.gui.jobs; package jadx.gui.jobs;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.Future; import java.util.concurrent.Future;
...@@ -38,10 +39,13 @@ public abstract class BackgroundJob { ...@@ -38,10 +39,13 @@ public abstract class BackgroundJob {
private class ShutdownTask extends FutureTask<Boolean> { private class ShutdownTask extends FutureTask<Boolean> {
public ShutdownTask() { public ShutdownTask() {
super(() -> { super(new Callable<Boolean>() {
runJob(); @Override
executor.shutdown(); public Boolean call() throws Exception {
return executor.awaitTermination(1, TimeUnit.HOURS); runJob();
executor.shutdown();
return executor.awaitTermination(5, TimeUnit.MINUTES);
}
}); });
} }
......
...@@ -462,6 +462,11 @@ public abstract class CommonSearchDialog extends JDialog { ...@@ -462,6 +462,11 @@ public abstract class CommonSearchDialog extends JDialog {
@Override @Override
public void done() { public void done() {
try {
get();
} catch (Exception e) {
LOG.error("Load task failed", e);
}
loadFinishedCommon(); loadFinishedCommon();
loadFinished(); loadFinished();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment