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

@ -649,7 +649,7 @@ bool GMainWindow::LoadROM(const QString& filename) {
Core::System& system{Core::System::GetInstance()};
const Core::System::ResultStatus result{system.Load(render_window, filename.toStdString())};
const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())};
if (result != Core::System::ResultStatus::Success) {
switch (result) {