piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix games crashing on start

Browse Source
This commit is contained in:
spycrab
2017-05-23 22:12:01 +02:00
parent f994538875
commit d65006b91b
8 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/DolphinQt2/MainWindow.cpp
View File

@ -10,7 +10,12 @@
#include "Core/BootManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/GCKeyboard.h"
#include "Core/HW/GCPad.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/Wiimote.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HotkeyManager.h"
#include "Core/Movie.h"
#include "Core/NetPlayProto.h"
#include "Core/State.h"
@ -24,6 +29,8 @@
#include "DolphinQt2/Resources.h"
#include "DolphinQt2/Settings.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
MainWindow::MainWindow() : QMainWindow(nullptr)
{
setWindowTitle(tr("Dolphin"));
@ -38,6 +45,8 @@ MainWindow::MainWindow() : QMainWindow(nullptr)
ConnectRenderWidget();
ConnectStack();
ConnectMenuBar();
InitControllers();
}
MainWindow::~MainWindow()
@ -45,6 +54,18 @@ MainWindow::~MainWindow()
m_render_widget->deleteLater();
}
void MainWindow::InitControllers()
{
if (g_controller_interface.IsInit())
return;
g_controller_interface.Initialize(reinterpret_cast<void*>(winId()));
Pad::Initialize();
Keyboard::Initialize();
Wiimote::Initialize(Wiimote::InitializeMode::DO_NOT_WAIT_FOR_WIIMOTES);
HotkeyManagerEmu::Initialize();
}
void MainWindow::CreateComponents()
{
m_menu_bar = new MenuBar(this);