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

Merge pull request #7324 from spycrab/qt_independent_tas 

Qt/TAS: Make TAS input windows independent
This commit is contained in:
spycrab 2018-08-15 01:51:26 +02:00 committed by GitHub
parent 0626c230a4 9739ad9f48
commit fb382e90eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,6 +164,13 @@ MainWindow::~MainWindow()
{ {
m_render_widget->deleteLater(); m_render_widget->deleteLater();
m_netplay_dialog->deleteLater(); m_netplay_dialog->deleteLater();
for (int i = 0; i < 4; i++)
{
m_gc_tas_input_windows[i]->deleteLater();
m_wii_tas_input_windows[i]->deleteLater();
}
ShutdownControllers(); ShutdownControllers();
QSettings& settings = Settings::GetQSettings(); QSettings& settings = Settings::GetQSettings();
@ -253,8 +260,8 @@ void MainWindow::CreateComponents()
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
m_gc_tas_input_windows[i] = new GCTASInputWindow(this, i); m_gc_tas_input_windows[i] = new GCTASInputWindow(nullptr, i);
m_wii_tas_input_windows[i] = new WiiTASInputWindow(this, i); m_wii_tas_input_windows[i] = new WiiTASInputWindow(nullptr, i);
} }
Movie::SetGCInputManip([this](GCPadStatus* pad_status, int controller_id) { Movie::SetGCInputManip([this](GCPadStatus* pad_status, int controller_id) {