Merge remote-tracking branch 'origin/GP-1501_dev747368_decompiler_switch_analyzer_cancel'

This commit is contained in:
Ryan Kurtz 2022-11-17 01:09:28 -05:00
commit 85ec38dbea

View File

@ -15,10 +15,11 @@
*/
package ghidra.app.plugin.core.analysis;
import java.math.BigInteger;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.math.BigInteger;
import generic.concurrent.*;
import ghidra.app.cmd.function.CreateFunctionCmd;
import ghidra.app.cmd.function.DecompilerSwitchAnalysisCmd;
@ -115,8 +116,11 @@ public class DecompilerSwitchAnalyzer extends AbstractAnalyzer {
return true;
}
monitor.checkCanceled();
runDecompilerAnalysis(program, definedFunctions, monitor);
monitor.checkCanceled();
runDecompilerAnalysis(program, undefinedFunctions, monitor);
monitor.checkCanceled();
}
catch (CancelledException ce) {
throw ce;