Merge branch '3.4'

This commit is contained in:
Ghostkeeper 2018-06-06 16:58:01 +02:00
commit c42b275c5d
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
51 changed files with 18836 additions and 15903 deletions

View file

@ -161,7 +161,8 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
b"name": address.encode("utf-8"),
b"address": address.encode("utf-8"),
b"manual": b"true",
b"incomplete": b"true"
b"incomplete": b"true",
b"temporary": b"true" # Still a temporary device until all the info is retrieved in _onNetworkRequestFinished
}
if instance_name not in self._discovered_devices: