3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 07:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06

Browse source
This commit is contained in:
Tamara Hogenhout 2015-07-10 17:53:55 +02:00
commit d41f1a410c
4 changed files with 43 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/CuraApplication.py
View file

@ -111,6 +111,7 @@ class CuraApplication(QtApplication):
self._plugin_registry.loadPlugin("CuraEngineBackend")
def addCommandLineOptions(self, parser):
super().addCommandLineOptions(parser)
parser.add_argument("file", nargs="*", help="Files to load after starting the application.")
def run(self):
@ -549,7 +550,7 @@ class CuraApplication(QtApplication):
op.push()
def _onJobFinished(self, job):
if type(job) is not ReadMeshJob:
if type(job) is not ReadMeshJob or not job.getResult():
return
f = QUrl.fromLocalFile(job.getFileName())