Merge remote-tracking branch 'fork/develop' into stable

* fork/develop:
  setTBR - check for TBR and RUNTIME
This commit is contained in:
Johannes Mockenhaupt 2017-07-26 18:18:10 +02:00
commit b96edc048e
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1

View file

@ -278,7 +278,7 @@ public class SetTbrCommand implements Command {
scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU);
// new TBR set; percentage and duration must be displayed ...
if (!scripter.currentMenu.attributes().contains(MenuAttribute.TBR) ||
!scripter.currentMenu.attributes().contains(MenuAttribute.TBR)) {
!scripter.currentMenu.attributes().contains(MenuAttribute.RUNTIME)) {
throw new CommandException().message("Setting TBR failed, according to MAIN_MENU no TBR is active");
}
Double mmTbrPercentage = (Double) scripter.currentMenu.getAttribute(MenuAttribute.TBR);