mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-28 19:58:53 +00:00
Merge branch 'master' of https://github.com/dolphin-emu/dolphin into dolphin-emu-maste2r
This commit is contained in:
commit
75a9451d0b
218 changed files with 53095 additions and 44354 deletions
|
@ -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"))};
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue