Skip to content
Permalink
Browse files

Qt/MainWindow: Directly delete unparented dialogs

Calling deleteLater in MainWindow's destructor doesn't work, as the
event loop will stop before it gets around to deleting these dialogs.
Seeing as this is a QObject destructor, we should already be on the
event loop anyways, so simply using delete should be safe.
  • Loading branch information...
Techjar committed Jan 19, 2019
1 parent 3627ef8 commit 47cc5b02e3dc78ed9520d691607c2a8427e50440
Showing with 4 additions and 4 deletions.
  1. +4 −4 Source/Core/DolphinQt/MainWindow.cpp
@@ -243,13 +243,13 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters) : QMainW

MainWindow::~MainWindow()
{
m_render_widget->deleteLater();
m_netplay_dialog->deleteLater();
delete m_render_widget;
delete m_netplay_dialog;

for (int i = 0; i < 4; i++)
{
m_gc_tas_input_windows[i]->deleteLater();
m_wii_tas_input_windows[i]->deleteLater();
delete m_gc_tas_input_windows[i];
delete m_wii_tas_input_windows[i];
}

ShutdownControllers();

0 comments on commit 47cc5b0

Please sign in to comment.
You can’t perform that action at this time.