|
|
@@ -105,9 +105,11 @@ class RoomCalCoordinator(DataUpdateCoordinator[CoordinatorData]):
|
|
|
store_next = self._with_defaults(self.store.get(STORE_NEXT))
|
|
|
|
|
|
if self._override is not None:
|
|
|
- displayed_next = self._override.next if self._override.next is not None else store_next
|
|
|
+ displayed_next = (
|
|
|
+ self._with_defaults(self._override.next) if self._override.next is not None else store_next
|
|
|
+ )
|
|
|
return CoordinatorData(
|
|
|
- current=self._override.current,
|
|
|
+ current=self._with_defaults(self._override.current),
|
|
|
next=displayed_next,
|
|
|
current_last_refresh=self._current_last_refresh,
|
|
|
next_last_refresh=self._next_last_refresh,
|
|
|
@@ -285,11 +287,11 @@ class RoomCalCoordinator(DataUpdateCoordinator[CoordinatorData]):
|
|
|
self._override = override
|
|
|
self.cancel_mode_sync()
|
|
|
displayed_next = (
|
|
|
- override.next if override.next is not None
|
|
|
- else self.store.get(STORE_NEXT) or self._empty_reservation()
|
|
|
+ self._with_defaults(override.next) if override.next is not None
|
|
|
+ else self._with_defaults(self.store.get(STORE_NEXT) or self._empty_reservation())
|
|
|
)
|
|
|
self.async_set_updated_data(CoordinatorData(
|
|
|
- current=override.current,
|
|
|
+ current=self._with_defaults(override.current),
|
|
|
next=displayed_next,
|
|
|
current_last_refresh=self._current_last_refresh,
|
|
|
next_last_refresh=self._next_last_refresh,
|