diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2018-08-15 01:51:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 01:51:26 +0200 |
| commit | fb382e90ebe65d23cffc6d927470ca8ad1c3efb4 (patch) | |
| tree | 374479017a5766238d84f9066a89c1eef3f9422e /Source/Core/DolphinQt/MainWindow.cpp | |
| parent | 0626c230a4a55f1d10e0647e891d580c129414d6 (diff) | |
| parent | 9739ad9f48eec545abd26e30ae17625a913b258f (diff) | |
Merge pull request #7324 from spycrab/qt_independent_tas
Qt/TAS: Make TAS input windows independent
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 31917b6c86..bacd46df81 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -164,6 +164,13 @@ MainWindow::~MainWindow() { m_render_widget->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(); QSettings& settings = Settings::GetQSettings(); @@ -253,8 +260,8 @@ void MainWindow::CreateComponents() for (int i = 0; i < 4; i++) { - m_gc_tas_input_windows[i] = new GCTASInputWindow(this, i); - m_wii_tas_input_windows[i] = new WiiTASInputWindow(this, i); + m_gc_tas_input_windows[i] = new GCTASInputWindow(nullptr, i); + m_wii_tas_input_windows[i] = new WiiTASInputWindow(nullptr, i); } Movie::SetGCInputManip([this](GCPadStatus* pad_status, int controller_id) { |
