dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-21 15:45:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kraken: Fix errors from rebase and format files

Browse source
This commit is contained in:
german77 2021-10-15 19:07:47 -05:00 • committed by Narr the Reg
parent 66cf94709a
commit 0292fe0198
20 changed files with 83 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/yuzu/main.cpp
View file

@ -228,7 +228,7 @@ GMainWindow::GMainWindow()
ConnectMenuEvents();
ConnectWidgetEvents();
Core::System::GetInstance().HIDCore().ReloadInputDevices();
system->HIDCore().ReloadInputDevices();
const auto branch_name = std::string(Common::g_scm_branch);
const auto description = std::string(Common::g_scm_desc);
@ -924,7 +924,7 @@ void GMainWindow::InitializeDebugWidgets() {
waitTreeWidget->hide();
debug_menu->addAction(waitTreeWidget->toggleViewAction());
controller_dialog = new ControllerDialog(this);
controller_dialog = new ControllerDialog(*system, this);
controller_dialog->hide();
debug_menu->addAction(controller_dialog->toggleViewAction());
@ -3372,7 +3372,8 @@ void GMainWindow::closeEvent(QCloseEvent* event) {
UpdateUISettings();
game_list->SaveInterfaceLayout();
hotkey_registry.SaveHotkeys();
Core::System::GetInstance().HIDCore().UnloadInputDevices();
controller_dialog->UnloadController();
system->HIDCore().UnloadInputDevices();
// Shutdown session if the emu thread is active...
if (emu_thread != nullptr) {