Merge branch 'master' into feature/telegram_address

# Conflicts: # changelog.md
XKNX · Nov 28, 2020 · 5e507a0 · 5e507a0
2 parents 6028759 + ffec8c1
commit 5e507a0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,12 @@
 
 - Telegram: `group_address` renamed to `address`, to prepare support for other APCI services.
 
+## 0.15.6 Bugfix for StateUpater 2020-11-26
+
+### Bugfixes
+
+- StateUpdater: shield from cancellation so update_received() don't cancel ongoing RemoteValue.read_state()
+
 ## 0.15.5 A Telegram for everyone 2020-11-25
 
 ### Internals

diff --git a/xknx/__version__.py b/xknx/__version__.py
@@ -1,3 +1,3 @@
 """XKNX version."""
 
-__version__ = "0.15.5"
+__version__ = "0.15.6"
diff --git a/xknx/core/state_updater.py b/xknx/core/state_updater.py
@@ -86,7 +86,9 @@ async def read_state_mutex():
                     remote_value.device_name,
                     remote_value.feature_name,
                 )
-                await remote_value.read_state(wait_for_result=True)
+                # shield from cancellation so update_received() don't cancel the
+                # ValueReader leaving the telegram_received_cb until next telegram
+                await asyncio.shield(remote_value.read_state(wait_for_result=True))
 
         tracker_type, update_interval = parse_tracker_options(tracker_options)
         tracker = _StateTracker(