caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fix trigger order when merging connectors

Browse source
This commit is contained in:
Nico Schmitz 2018-10-25 01:01:50 +02:00
parent 1c8c51841c
commit c40dc583a3
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/general/automation/triggers/TriggerConnector.java
View file

@ -264,9 +264,11 @@ public class TriggerConnector extends Trigger {
// merge connectors // merge connectors
if (connector != null && (connector.getConnectorType().equals(connectorType) || size() == 1)) { if (connector != null && (connector.getConnectorType().equals(connectorType) || size() == 1)) {
final int pos = connector.pos(this);
connector.remove(this); connector.remove(this);
for (Trigger t : list) { // move triggers of child connector into parent connector
connector.add(t); for (int i = size()-1; i >= 0; --i) {
connector.add(pos, get(i));
} }
list.clear(); list.clear();
return connector.simplify(); return connector.simplify();