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

Merge branch '3.3'

Browse source
This commit is contained in:
Lipu Fei 2018-04-10 11:41:13 +02:00
commit 107c10b860
5 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/CuraApplication.py
View file

@ -1562,8 +1562,8 @@ class CuraApplication(QtApplication):
openProjectFile = pyqtSignal(QUrl, arguments = ["project_file"]) # Emitted when a project file is about to open.
@pyqtSlot(QUrl)
def readLocalFile(self, file):
@pyqtSlot(QUrl, bool)
def readLocalFile(self, file, skip_project_file_check = False):
if not file.isValid():
return
@ -1574,7 +1574,7 @@ class CuraApplication(QtApplication):
self.deleteAll()
break
if self.checkIsValidProjectFile(file):
if not skip_project_file_check and self.checkIsValidProjectFile(file):
self.callLater(self.openProjectFile.emit, file)
return