Skip to content

Commit

Permalink
desktop-ui: emulator::construct must be called *before* settings are …
Browse files Browse the repository at this point in the history
…loaded

BIOS settings depend on being able to iterate through Emulators.
  • Loading branch information
LukeUsher committed Nov 8, 2023
1 parent e7760bf commit 0ceaf17
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions desktop-ui/desktop-ui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ auto nall::main(Arguments arguments) -> void {
}

inputManager.create();
Emulator::construct();
settings.load();

if(arguments.find("--setting")) {
Expand All @@ -103,8 +104,6 @@ auto nall::main(Arguments arguments) -> void {
settings.process(true);
}

Emulator::construct();

if(arguments.take("--help")) {
print("Usage: ares [OPTIONS]... game(s)\n\n");
print("Options:\n");
Expand Down

0 comments on commit 0ceaf17

Please sign in to comment.