Merge branch 'dev' into history

This commit is contained in:
Milos Kozak 2017-05-26 15:06:04 +02:00
commit 0371e97391

View file

@ -327,6 +327,10 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
}
if (useSuperBolus) {
final LoopPlugin activeloop = MainApp.getConfigBuilder().getActiveLoop();
if (activeloop != null) {
activeloop.superBolusTo(new Date().getTime() + 2 * 60L * 60 * 1000);
MainApp.bus().post(new EventRefreshGui(false));
}
result = pump.setTempBasalAbsolute(0d, 120);
if (!result.success) {
AlertDialog.Builder builder = new AlertDialog.Builder(context);
@ -335,10 +339,6 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
builder.show();
}
if (activeloop != null) {
activeloop.superBolusTo(new Date().getTime() + 2 * 60L * 60 * 1000);
MainApp.bus().post(new EventRefreshGui(false));
}
}
}
});