checking optional before accessing value

Pietfried · corneliusclaussen · commit 5a0840d0eac2 · 2023-03-23T11:25:24.000+01:00
Signed-off-by: pietfried &lt;pietgoempel@gmail.com&gt;
diff --git a/modules/EnergyManager/Market.cpp b/modules/EnergyManager/Market.cpp
@@ -160,7 +160,7 @@ ScheduleReq Market::get_max_available_energy(const ScheduleReq& request) {
                 (*r).limits_to_leaves.total_power_W.value() / (*r).conversion_efficiency.value_or(1.);
         }
         // do we have a lower watt limit on root side?
-        if ((*r).limits_to_root.total_power_W.has_value() &&
+        if ((*r).limits_to_root.total_power_W.has_value() && a.limits_to_root.total_power_W.has_value() &&
             a.limits_to_root.total_power_W.value() > (*r).limits_to_root.total_power_W.value()) {
             a.limits_to_root.total_power_W = (*r).limits_to_root.total_power_W.value();
         }

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ ScheduleReq Market::get_max_available_energy(const ScheduleReq& request) {`
`160`	`160`	`(r).limits_to_leaves.total_power_W.value() / (r).conversion_efficiency.value_or(1.);`
`161`	`161`	`}`
`162`	`162`	`// do we have a lower watt limit on root side?`
`163`		`- if ((*r).limits_to_root.total_power_W.has_value() &&`
	`163`	`+ if ((*r).limits_to_root.total_power_W.has_value() && a.limits_to_root.total_power_W.has_value() &&`
`164`	`164`	`a.limits_to_root.total_power_W.value() > (*r).limits_to_root.total_power_W.value()) {`
`165`	`165`	`a.limits_to_root.total_power_W = (*r).limits_to_root.total_power_W.value();`
`166`	`166`	`}`