Merge remote-tracking branch 'origin/main' into user_and_settings

src/main.cpp

@@ -91,7 +91,6 @@ int main(int argc, char* argv[]) {
         const auto& extras = app.remaining();
         if (!extras.empty()) {
             gameArgs = extras;
-            gameArgs.erase(gameArgs.begin());
         }
     });
 
@@ -135,6 +134,14 @@ int main(int argc, char* argv[]) {
             return 1;
         }
     }
+    if (!gameArgs.empty()) {
+        if (gameArgs.front() == "--") {
+            gameArgs.erase(gameArgs.begin());
+        } else {
+            std::cerr << "Error: unhandled flags\n";
+            return 1;
+        }
+    }
 
     // ---- Apply flags ----
     if (patchFile)