diff options
| -rw-r--r-- | lib/Core/Executor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index d0fc43cf..fd6cf441 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -311,7 +311,9 @@ Executor::Executor(const InterpreterOptions &opts, inhibitForking(false), haltExecution(false), ivcEnabled(false), - stpTimeout(std::min(MaxSTPTime,MaxInstructionTime)) { + stpTimeout(MaxSTPTime != 0 && MaxInstructionTime != 0 + ? std::min(MaxSTPTime,MaxInstructionTime) + : std::max(MaxSTPTime,MaxInstructionTime)) { STPSolver *stpSolver = new STPSolver(UseForkedSTP); Solver *solver = constructSolverChain(stpSolver, |