caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fail command if currentMenu becomes null.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-11-03 22:03:40 +01:00
parent 142878a22b
commit 780f4901f4
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -486,17 +486,9 @@ public class RuffyScripter implements RuffyCommands {
public Menu getCurrentMenu() { public Menu getCurrentMenu() {
if (Thread.currentThread().isInterrupted()) if (Thread.currentThread().isInterrupted())
throw new CommandException("Interrupted"); throw new CommandException("Interrupted");
long timeout = System.currentTimeMillis() + 5 * 1000; if (currentMenu == null) {
// TODO this is probably due to a disconnect and rtDisconnect having nulled currentMenu. log.error("currentMenu == null, bailing");
// This here might just work, but needs a more controlled approach when implementing throw new CommandException("Unable to read current menu");
// something to deal with connection loses
// TODO force reconnect? and retry?
while (currentMenu == null) {
if (System.currentTimeMillis() > timeout) {
throw new CommandException("Unable to read current menu");
}
log.debug("currentMenu == null, waiting");
waitForMenuUpdate();
} }
return currentMenu; return currentMenu;
} }