From 3b287df77ddcbe186f8b834c4975d01684040dba Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Tue, 18 Jul 2017 10:24:45 +0200
Subject: [PATCH] Check active menu again when retrying inputs.

---
 .../java/de/jotomo/ruffyscripter/commands/BolusCommand.java     | 2 ++
 .../java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java
index 255f5cda71..d417cf958c 100644
--- a/app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java
+++ b/app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java
@@ -100,6 +100,7 @@ public class BolusCommand implements Command {
     }
 
     private void inputBolusAmount(RuffyScripter scripter) {
+        scripter.verifyMenuIsDisplayed(MenuType.BOLUS_ENTER);
         // press 'up' once for each 0.1 U increment
         long steps = Math.round(bolus * 10);
         for (int i = 0; i < steps; i++) {
@@ -110,6 +111,7 @@ public class BolusCommand implements Command {
     }
 
     private void verifyDisplayedBolusAmount(RuffyScripter scripter) {
+        scripter.verifyMenuIsDisplayed(MenuType.BOLUS_ENTER);
         double displayedBolus = readDisplayedBolusAmount(scripter);
         log.debug("Final bolus: " + displayedBolus);
         if (Math.abs(displayedBolus - bolus) > 0.05) {
diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
index f1ddb20516..7e5c1bf244 100644
--- a/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
+++ b/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
@@ -157,6 +157,7 @@ public class SetTbrCommand implements Command {
     }
 
     private void verifyDisplayedTbrPercentage(RuffyScripter scripter) {
+        scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
         long displayedPercentage = readDisplayedTbrPercentage(scripter);
         if (displayedPercentage != this.percentage) {
             log.debug("Final displayed TBR percentage: " + displayedPercentage);
@@ -176,6 +177,7 @@ public class SetTbrCommand implements Command {
     }
 
     private void inputTbrDuration(RuffyScripter scripter) {
+        scripter.verifyMenuIsDisplayed(MenuType.TBR_DURATION);
         long currentDuration = readDisplayedTbrDuration(scripter);
         if (currentDuration % 15 != 0) {
             // The duration displayed is how long an active TBR will still run,