caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Wait for currentMenu to be != null

Browse source 
(cherry picked from commit 13b96ec)
This commit is contained in:
Johannes Mockenhaupt 2017-09-06 11:02:35 +02:00
parent fd7f4ae145
commit 15bac4d386
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/RuffyScripter.java
View file

@ -474,10 +474,12 @@ public class RuffyScripter {
// === pump ops === // === pump ops ===
public Menu getCurrentMenu() { public Menu getCurrentMenu() {
// TODO workaround, supposedly fixed in latest ruffy? long timeout = System.currentTimeMillis() + 5 * 1000;
while (currentMenu == null) { while (currentMenu == null) {
if (System.currentTimeMillis() > timeout) {
throw new CommandException().message("Unable to read current menu");
}
log.error("currentMenu == null, waiting"); log.error("currentMenu == null, waiting");
SystemClock.sleep(500);
waitForMenuUpdate(); waitForMenuUpdate();
} }
return currentMenu; return currentMenu;