Merge pull request #4381 from Sonicadvance1/fix_double_load

ArgumentLoader: Fixes double load
FEX-Emu · Mar 5, 2025 · 97070aa · 97070aa
2 parents 3964018 + 46d0df9
commit 97070aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Source/Common/ArgumentLoader.cpp b/Source/Common/ArgumentLoader.cpp
@@ -11,7 +11,7 @@
 #include <stdint.h>
 
 namespace FEX::ArgLoader {
-void FEX::ArgLoader::ArgLoader::Load() {
+void FEX::ArgLoader::ArgLoader::PreLoad() {
   RemainingArgs.clear();
   ProgramArguments.clear();
   if (Type == LoadType::WITHOUT_FEXLOADER_PARSER) {

diff --git a/Source/Common/ArgumentLoader.h b/Source/Common/ArgumentLoader.h
@@ -18,10 +18,13 @@ class ArgLoader final : public FEXCore::Config::Layer {
     , Type {Type}
     , argc {argc}
     , argv {argv} {
-    Load();
+    PreLoad();
   }
 
-  void Load() override;
+  void Load() override {
+    // Intentional no-op.
+  }
+  void PreLoad();
   void LoadWithoutArguments();
   fextl::vector<fextl::string> Get() {
     return RemainingArgs;