Merge pull request #4126 from FearlessTobi/port-892

Port #892 from yuzu: "Make global EmuWindow instance part of the base renderer class"
This commit is contained in:
James Rowe 2018-08-26 12:00:55 -06:00 committed by GitHub
commit a6723ec2eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 49 additions and 54 deletions

View file

@ -280,7 +280,7 @@ int main(int argc, char** argv) {
SCOPE_EXIT({ system.Shutdown(); });
const Core::System::ResultStatus load_result{system.Load(emu_window.get(), filepath)};
const Core::System::ResultStatus load_result{system.Load(*emu_window, filepath)};
switch (load_result) {
case Core::System::ResultStatus::ErrorGetLoader: