Merge branch 'master' of https://github.com/dolphin-emu/dolphin into dolphin-emu-maste2r

This commit is contained in:
Nayla Hanegan 2024-12-24 20:47:03 -05:00
commit 75a9451d0b
218 changed files with 53095 additions and 44354 deletions

View file

@ -257,7 +257,8 @@ int main(int argc, char* argv[])
Settings::Instance().InitDefaultPalette();
Settings::Instance().ApplyStyle();
MainWindow win{std::move(boot), static_cast<const char*>(options.get("movie"))};
MainWindow win{Core::System::GetInstance(), std::move(boot),
static_cast<const char*>(options.get("movie"))};