Merge remote-tracking branch 'origin/dev' into ns15
This commit is contained in:
commit
bd765be584
1 changed files with 4 additions and 1 deletions
|
@ -187,7 +187,10 @@ class PluginStore @Inject constructor(
|
|||
get() = activeAPSStore ?: checkNotNull(activeAPSStore) { "No APS selected" }
|
||||
|
||||
override val activePump: Pump
|
||||
get() = activePumpStore ?: checkNotNull(activePumpStore) { "No pump selected" }
|
||||
get() = activePumpStore
|
||||
// Following line can be used only during initialization
|
||||
?: getTheOneEnabledInArray(getSpecificPluginsList(PluginType.PUMP), PluginType.PUMP) as Pump?
|
||||
?: checkNotNull(activePumpStore) { "No pump selected" }
|
||||
|
||||
override val activeSensitivity: Sensitivity
|
||||
get() = activeSensitivityStore
|
||||
|
|
Loading…
Reference in a new issue