From d3058f60636d4b7e6e7f6da596a97893081260d9 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Sat, 12 Aug 2017 14:01:57 +0200 Subject: [PATCH] Let an unexpected warning/error escalate rather than hide it. --- .../main/java/de/jotomo/ruffyscripter/RuffyScripter.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java index 6fc1a9d470..3c12acf697 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java +++ b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java @@ -459,8 +459,12 @@ public class RuffyScripter { { if(currentMenu!=null && currentMenu.getType()==MenuType.WARNING_OR_ERROR) { + throw new CommandException().message("Warning/errors raised by pump, please check pump"); + // since warnings and errors can occur at any time, they should be dealt with in + // a more general way, see the handleMenuUpdate callback above //FIXME bad thing to do :D - pressCheckKey(); + // yup, commenting this out since I don't want an occlusionn alert to hidden by this :-) + //pressCheckKey(); } else if(currentMenu!=null && !currentMenu.getType().isMaintype()) {