BUG: #994

opendm/osfm.py

@@ -212,8 +212,9 @@ def get_submodel_argv(project_name = None, submodels_path = None, submodel_name
     while i < len(argv):
         arg = argv[i]
         
-        # Last?
-        if i == len(argv) - 1:
+        if i == 1 and project_name and submodel_name and arg == project_name:
+            i += 1
+        elif i == len(argv) - 1:
             # Project name?
             if project_name and submodel_name and arg == project_name:
                 result.append(submodel_name)
@@ -243,13 +244,13 @@ def get_submodel_argv(project_name = None, submodels_path = None, submodel_name
         result.append('--project-path')
         result.append(submodels_path)
     
-    if not found_args.get('project_name') and submodel_name:
-        result.append(submodel_name)
-
     for arg in assure_always:
         if not found_args.get(arg):
             result.append(arg)
 
+    if not found_args.get('project_name') and submodel_name:
+        result.append(submodel_name)
+
     return result
 
 def get_submodel_args_dict():