jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Clear list boxes in ::closeEvent 

Ensures that ->deleteLater events are put in to the event queue before
the destructor is called.
master
jp9000 2015-03-18 07:02:58 -07:00
parent 6b3d30ef03
commit 87965fa9eb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
obs/window-basic-main.cpp
View File

@ -683,10 +683,6 @@ OBSBasic::~OBSBasic()
if (advAudioWindow)
delete advAudioWindow;
ClearVolumeControls();
ui->sources->clear();
ui->scenes->clear();
obs_enter_graphics();
gs_vertexbuffer_destroy(box);
gs_vertexbuffer_destroy(circle);
@ -1671,6 +1667,13 @@ void OBSBasic::closeEvent(QCloseEvent *event)
* the program data is being freed */
delete saveTimer;
SaveProject();
/* Clear the list boxes in ::closeEvent to ensure that we can process
* any ->deleteLater events in this window created by Qt in relation to
* their internal data */
ClearVolumeControls();
ui->sources->clear();
ui->scenes->clear();
}
void OBSBasic::changeEvent(QEvent *event)