3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-09 07:56:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

STAR-322: Removing devices when logging off

Browse source
This commit is contained in:
Daniel Schiavini 2018-12-05 16:26:20 +01:00
parent 657e763318
commit 117cf10a2c
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
View file

@ -129,7 +129,7 @@ class CloudApiClient(NetworkClient):
data = response["data"] data = response["data"]
result = [model(**c) for c in data] if isinstance(data, list) else model(**data) result = [model(**c) for c in data] if isinstance(data, list) else model(**data)
on_finished(result) on_finished(result)
elif "error" in response: elif "errors" in response:
self._on_error([CloudErrorObject(**error) for error in response["errors"]]) self._on_error([CloudErrorObject(**error) for error in response["errors"]])
else: else:
Logger.log("e", "Cannot find data or errors in the cloud response: %s", response) Logger.log("e", "Cannot find data or errors in the cloud response: %s", response)

6
plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
View file

@ -62,6 +62,10 @@ class CloudOutputDeviceManager:
# The first call to _getRemoteClusters comes from self._account.loginStateChanged # The first call to _getRemoteClusters comes from self._account.loginStateChanged
if not self._update_timer.isActive(): if not self._update_timer.isActive():
self._update_timer.start() self._update_timer.start()
else:
self._onGetRemoteClustersFinished([])
if self._update_timer.isActive():
self._update_timer.stop()
## Callback for when the request for getting the clusters. is finished. ## Callback for when the request for getting the clusters. is finished.
def _onGetRemoteClustersFinished(self, clusters: List[CloudCluster]) -> None: def _onGetRemoteClustersFinished(self, clusters: List[CloudCluster]) -> None:
@ -73,6 +77,8 @@ class CloudOutputDeviceManager:
# Remove output devices that are gone # Remove output devices that are gone
for removed_cluster in removed_devices: for removed_cluster in removed_devices:
if removed_cluster.isConnected():
removed_cluster.disconnect()
self._output_device_manager.removeOutputDevice(removed_cluster.key) self._output_device_manager.removeOutputDevice(removed_cluster.key)
del self._remote_clusters[removed_cluster.key] del self._remote_clusters[removed_cluster.key]