mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

UI: Improve properties view object safety

Browse Source 
Use weak references on OBS objects that properties view reference in
order to ensure that the objects are still valid.

This fixes a crash where properties views would use objects without
necessarily knowing whether they were still valid or not.

Fixes obsproject/obs-studio#5862
Closes obsproject/obs-studio#5863
This commit is contained in:
jp9000 2022-02-02 22:01:08 -08:00
parent edfd5ad604
commit f34b6866a5
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
UI/properties-view.cpp
View File

@ -89,8 +89,10 @@ Q_DECLARE_METATYPE(media_frames_per_second);
void OBSPropertiesView::ReloadProperties()
{
if (obj) {
properties.reset(reloadCallback(obj));
if (weakObj) {
OBSObject obj = GetObject();
if (obj)
properties.reset(reloadCallback(obj.Get()));
} else {
properties.reset(reloadCallback((void *)type.c_str()));
obs_properties_apply_settings(properties.get(), settings);
@ -174,14 +176,14 @@ void OBSPropertiesView::GetScrollPos(int &h, int &v)
v = scroll->value();
}
OBSPropertiesView::OBSPropertiesView(OBSData settings_, void *obj_,
OBSPropertiesView::OBSPropertiesView(OBSData settings_, void *obj,
PropertiesReloadCallback reloadCallback,
PropertiesUpdateCallback callback_,
PropertiesVisualUpdateCb cb_, int minSize_)
: VScrollArea(nullptr),
properties(nullptr, obs_properties_destroy),
settings(settings_),
obj(obj_),
weakObj(obs_object_get_weak_object((obs_object_t *)obj)),
reloadCallback(reloadCallback),
callback(callback_),
cb(cb_),
@ -1905,7 +1907,7 @@ void WidgetInfo::ButtonClicked()
}
return;
}
if (obs_property_button_clicked(property, view->obj)) {
if (obs_property_button_clicked(property, view->GetObject())) {
QMetaObject::invokeMethod(view, "RefreshProperties",
Qt::QueuedConnection);
}
@ -1981,9 +1983,10 @@ void WidgetInfo::ControlChanged()
update_timer = new QTimer;
connect(update_timer, &QTimer::timeout,
[this, &ru = recently_updated]() {
if (view->callback && !view->deferUpdate) {
view->callback(view->obj,
old_settings_cache,
OBSObject obj = view->GetObject();
if (obj && view->callback &&
!view->deferUpdate) {
view->callback(obj, old_settings_cache,
view->settings);
}
@ -2000,8 +2003,11 @@ void WidgetInfo::ControlChanged()
blog(LOG_DEBUG, "No update timer or no callback!");
}
if (view->cb && !view->deferUpdate)
view->cb(view->obj, view->settings);
if (view->cb && !view->deferUpdate) {
OBSObject obj = view->GetObject();
if (obj)
view->cb(obj, view->settings);
}
view->SignalChanged();

9
UI/properties-view.hpp
View File

@ -97,7 +97,7 @@ private:
QWidget *widget = nullptr;
properties_t properties;
OBSData settings;
void *obj = nullptr;
OBSWeakObjectAutoRelease weakObj;
std::string type;
PropertiesReloadCallback reloadCallback;
PropertiesUpdateCallback callback = nullptr;
@ -163,6 +163,11 @@ public:
inline obs_data_t *GetSettings() const { return settings; }
inline void UpdateSettings() { callback(obj, nullptr, settings); }
inline void UpdateSettings()
{
callback(OBSGetStrongRef(weakObj), nullptr, settings);
}
inline bool DeferUpdate() const { return deferUpdate; }
inline OBSObject GetObject() const { return OBSGetStrongRef(weakObj); }
};