Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jadx
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
jadx
Commits
ea01102f
Commit
ea01102f
authored
Mar 29, 2018
by
Skylot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gui: fix decompilation task on search (#235)
parent
15e1e1df
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
BackgroundJob.java
jadx-gui/src/main/java/jadx/gui/jobs/BackgroundJob.java
+8
-4
CommonSearchDialog.java
jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java
+5
-0
No files found.
jadx-gui/src/main/java/jadx/gui/jobs/BackgroundJob.java
View file @
ea01102f
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
(()
->
{
super
(
new
Callable
<
Boolean
>()
{
@Override
public
Boolean
call
()
throws
Exception
{
runJob
();
executor
.
shutdown
();
return
executor
.
awaitTermination
(
1
,
TimeUnit
.
HOURS
);
return
executor
.
awaitTermination
(
5
,
TimeUnit
.
MINUTES
);
}
});
}
...
...
jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java
View file @
ea01102f
...
...
@@ -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
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment