GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move cleaning up of request to after signals are disconnected

Browse Source 
CURA-8587
This commit is contained in:
Jaime van Kessel 2021-12-17 16:48:06 +01:00
parent 83c78c4b4d
commit a2a76fefdd
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Marketplace/PackageList.py
View File

@ -53,13 +53,15 @@ class PackageList(ListModel):
def __del__(self) -> None: def __del__(self) -> None:
""" When this object is deleted it will loop through all registered API requests and aborts them """ """ When this object is deleted it will loop through all registered API requests and aborts them """
self.cleanUpAPIRequest()
try: try:
self.isLoadingChanged.disconnect() self.isLoadingChanged.disconnect()
self.hasMoreChanged.disconnect() self.hasMoreChanged.disconnect()
except RuntimeError: except RuntimeError:
pass pass
self.cleanUpAPIRequest()
def abortRequest(self, request_id: str) -> None: def abortRequest(self, request_id: str) -> None:
"""Aborts a single request""" """Aborts a single request"""
if request_id in self._ongoing_requests and self._ongoing_requests[request_id]: if request_id in self._ongoing_requests and self._ongoing_requests[request_id]:

5
plugins/Marketplace/PackageModel.py
View File

@ -88,10 +88,7 @@ class PackageModel(QObject):
self.setCanUpdate(self._package_manager.checkIfPackageCanUpdate(self._package_id)) self.setCanUpdate(self._package_manager.checkIfPackageCanUpdate(self._package_id))
def __del__(self): def __del__(self):
try: self._package_manager.packagesWithUpdateChanged.disconnect(self._processUpdatedPackages)
self._package_manager.packagesWithUpdateChanged.disconnect(self._processUpdatedPackages)
except RuntimeError:
pass
def __eq__(self, other: object) -> bool: def __eq__(self, other: object) -> bool:
if isinstance(other, PackageModel): if isinstance(other, PackageModel):