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

Do not use CuraVersion data if strings are empty

Browse source 
CURA-5357
This commit is contained in:
Lipu Fei 2018-05-30 09:20:00 +02:00
parent fae9bc838b
commit f1bb0e58e7
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/Toolbox/src/Toolbox.py
View file

@ -175,6 +175,8 @@ class Toolbox(QObject, Extension):
return self.DEFAULT_CLOUD_API_ROOT return self.DEFAULT_CLOUD_API_ROOT
if not hasattr(cura.CuraVersion, "CuraCloudAPIRoot"): if not hasattr(cura.CuraVersion, "CuraCloudAPIRoot"):
return self.DEFAULT_CLOUD_API_ROOT return self.DEFAULT_CLOUD_API_ROOT
if not cura.CuraVersion.CuraCloudAPIRoot:
return self.DEFAULT_CLOUD_API_ROOT
return cura.CuraVersion.CuraCloudAPIRoot return cura.CuraVersion.CuraCloudAPIRoot
# Get the cloud API version from CuraVersion # Get the cloud API version from CuraVersion
@ -183,6 +185,8 @@ class Toolbox(QObject, Extension):
return self.DEFAULT_CLOUD_API_VERSION return self.DEFAULT_CLOUD_API_VERSION
if not hasattr(cura.CuraVersion, "CuraCloudAPIVersion"): if not hasattr(cura.CuraVersion, "CuraCloudAPIVersion"):
return self.DEFAULT_CLOUD_API_VERSION return self.DEFAULT_CLOUD_API_VERSION
if not cura.CuraVersion.CuraCloudAPIVersion:
return self.DEFAULT_CLOUD_API_VERSION
return cura.CuraVersion.CuraCloudAPIVersion return cura.CuraVersion.CuraCloudAPIVersion
# Get the packages version depending on Cura version settings. # Get the packages version depending on Cura version settings.
@ -191,6 +195,8 @@ class Toolbox(QObject, Extension):
return self._plugin_registry.APIVersion return self._plugin_registry.APIVersion
if not hasattr(cura.CuraVersion, "CuraSDKVersion"): if not hasattr(cura.CuraVersion, "CuraSDKVersion"):
return self._plugin_registry.APIVersion return self._plugin_registry.APIVersion
if not cura.CuraVersion.CuraSDKVersion:
return self._plugin_registry.APIVersion
return cura.CuraVersion.CuraSDKVersion return cura.CuraVersion.CuraSDKVersion
@pyqtSlot() @pyqtSlot()