ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Use window instead of surface for ControllerInterface updates 

Fixes crashes with Vulkan on macOS.
This commit is contained in:
Stenzek 2020-05-24 17:35:39 +10:00
parent 393ce529af
commit ff92357b63
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Core.cpp
View File

@ -502,7 +502,7 @@ static void EmuThread(std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi
} }
else else
{ {
g_controller_interface.ChangeWindow(wsi.render_surface); g_controller_interface.ChangeWindow(wsi.render_window);
Pad::LoadConfig(); Pad::LoadConfig();
Keyboard::LoadConfig(); Keyboard::LoadConfig();
} }

2
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -1083,7 +1083,7 @@ void MainWindow::HideRenderWidget(bool reinit)
// The controller interface will still be registered to the old render widget, if the core // The controller interface will still be registered to the old render widget, if the core
// has booted. Therefore, we should re-bind it to the main window for now. When the core // has booted. Therefore, we should re-bind it to the main window for now. When the core
// is next started, it will be swapped back to the new render widget. // is next started, it will be swapped back to the new render widget.
g_controller_interface.ChangeWindow(GetWindowSystemInfo(windowHandle()).render_surface); g_controller_interface.ChangeWindow(GetWindowSystemInfo(windowHandle()).render_window);
} }
} }