From 559dbdf0b1c7b0fef1a7c5d5284338e76912ac39 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Mon, 18 Dec 2017 20:26:35 +0100 Subject: [PATCH] Undo over-eager optimization. Makes setting actual 90/110% TBRs impossiblee and will result in ComboPlugin starting TBRs with 100% (and failing because duration is not readable or 0). (cherry picked from commit 5a4e7d4) --- .../java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java index 63ac25a2f8..975eb0f50d 100644 --- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java +++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java @@ -124,9 +124,8 @@ public class SetTbrCommand extends BaseCommand { scripter.waitForScreenUpdate(); state = scripter.readPumpStateInternal(); } - // if we waited above and a cancellation (fake or hard) was requested, - // we already completed the request - if (!state.tbrActive && percentage >= 90 && percentage <= 110) { + // if we waited above and a cancellation was requested, we already completed the request + if (!state.tbrActive && percentage == 100) { result.success = true; return true; }