caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

RuffyScripter: fix pump state check before running command.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-11-22 00:38:10 +01:00
parent 28b80697f9
commit bb2e885b95
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
View file

@ -257,10 +257,12 @@ public class RuffyScripter implements RuffyCommands {
if (cmd instanceof ReadPumpStateCommand) { if (cmd instanceof ReadPumpStateCommand) {
// always allowed, state is set at the end of runCommand method // always allowed, state is set at the end of runCommand method
activeCmd.getResult().success = true; activeCmd.getResult().success = true;
} else if (getCurrentMenu().getType() == MenuType.STOP && cmd.needsRunMode()) { } else if (getCurrentMenu().getType() == MenuType.STOP) {
log.error("Requested command requires run mode, but pump is suspended"); if (cmd.needsRunMode()) {
activeCmd.getResult().success = false; log.error("Requested command requires run mode, but pump is suspended");
return; activeCmd.getResult().success = false;
return;
}
} else if (getCurrentMenu().getType() == MenuType.WARNING_OR_ERROR && !(cmd instanceof ConfirmAlertCommand)) { } else if (getCurrentMenu().getType() == MenuType.WARNING_OR_ERROR && !(cmd instanceof ConfirmAlertCommand)) {
log.warn("Warning/alert active on pump, but requested command is not ConfirmAlertCommand"); log.warn("Warning/alert active on pump, but requested command is not ConfirmAlertCommand");
activeCmd.getResult().success = false; activeCmd.getResult().success = false;