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

UI: Fix potential race condition

Browse Source 
The update_properties signal is created before the view itself is
created, therefore it was possible for the callback to trigger when the
view was invalid.
This commit is contained in:
jp9000 2015-03-04 04:34:06 -08:00
parent 8323799113
commit b515f08048
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
obs/window-basic-properties.cpp
View File

@ -38,10 +38,6 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
removedSignal (obs_source_get_signal_handler(source),
"remove", OBSBasicProperties::SourceRemoved,
this),
updatePropertiesSignal (obs_source_get_signal_handler(source),
"update_properties",
OBSBasicProperties::UpdateProperties,
this),
oldSettings (obs_data_create()),
buttonBox (new QDialogButtonBox(this))
{
@ -88,6 +84,11 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
setWindowTitle(QTStr("Basic.PropertiesWindow").arg(QT_UTF8(name)));
obs_source_inc_showing(source);
updatePropertiesSignal.Connect(obs_source_get_signal_handler(source),
"update_properties",
OBSBasicProperties::UpdateProperties,
this);
}
OBSBasicProperties::~OBSBasicProperties()