Browse Source

Revert "Do not show the "load project or models" dialog when opening a file from a command line argument"

This reverts commit abfd7e92, because the desired behavior has still tbd
Nino van Hooff 5 years ago
parent
commit
2c12d713e3
2 changed files with 5 additions and 5 deletions
  1. 3 3
      cura/CuraApplication.py
  2. 2 2
      cura/SingleInstance.py

+ 3 - 3
cura/CuraApplication.py

@@ -805,7 +805,7 @@ class CuraApplication(QtApplication):
 
     def _onPostStart(self):
         for file_name in self._files_to_open:
-            self.callLater(self._openFile, file_name, True)
+            self.callLater(self._openFile, file_name)
         for file_name in self._open_file_queue:  # Open all the files that were queued up while plug-ins were loading.
             self.callLater(self._openFile, file_name)
 
@@ -1549,8 +1549,8 @@ class CuraApplication(QtApplication):
             return
         job._node.setMeshData(mesh_data)
 
-    def _openFile(self, filename, skip_project_file_check = False):
-        self.readLocalFile(QUrl.fromLocalFile(filename), skip_project_file_check)
+    def _openFile(self, filename):
+        self.readLocalFile(QUrl.fromLocalFile(filename))
 
     def _addProfileReader(self, profile_reader):
         # TODO: Add the profile reader to the list of plug-ins that can be used when importing profiles.

+ 2 - 2
cura/SingleInstance.py

@@ -87,9 +87,9 @@ class SingleInstance:
                 if command == "clear-all":
                     self._application.callLater(lambda: self._application.deleteAll())
 
-                # Command: Load a model or project file
+                # Command: Load a model file
                 elif command == "open":
-                    self._application.callLater(lambda f, skip_check = payload["filePath"]: self._application._openFile(f, skip_check))
+                    self._application.callLater(lambda f = payload["filePath"]: self._application._openFile(f))
 
                 # Command: Activate the window and bring it to the top.
                 elif command == "focus":