caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'post-tbr-cancel-check' into 'develop'

Browse source 
SetTbrCommand: fix check in main menu after cancelling TBR.

See merge request !17
This commit is contained in:
Johannes Mockenhaupt 2017-08-15 11:45:02 +00:00
parent e9672ff4aa ec508b55c4
commit 8178b6ff00
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
View file

@ -236,7 +236,7 @@ public class SetTbrCommand implements Command {
Object durationObj = scripter.currentMenu.getAttribute(MenuAttribute.RUNTIME);
if (percentage == 100) {
if (percentageObj != null || durationObj != null)
if (durationObj != null)
throw new CommandException().message("TBR cancelled, but main menu shows a running TBR");
return new CommandResult().success(true).enacted(true).message("TBR was cancelled");
@ -260,7 +260,7 @@ public class SetTbrCommand implements Command {
String.format(Locale.US, "TBR set to %d%% for %d min", percentage, duration));
} catch (Exception e) {
log.error("got exception: ", e);
return new CommandResult().success(false).message("failed to wait: " + e.getMessage());
return new CommandResult().success(false).message(e.getMessage()).exception(e);
}
}