diff --git a/UI/properties-view.cpp b/UI/properties-view.cpp index 87a438f6a..3030f9e14 100644 --- a/UI/properties-view.cpp +++ b/UI/properties-view.cpp @@ -180,14 +180,15 @@ void OBSPropertiesView::GetScrollPos(int &h, int &v) OBSPropertiesView::OBSPropertiesView(OBSData settings_, obs_object_t *obj, PropertiesReloadCallback reloadCallback, PropertiesUpdateCallback callback_, - PropertiesVisualUpdateCb cb_, int minSize_) + PropertiesVisualUpdateCb visUpdateCb_, + int minSize_) : VScrollArea(nullptr), properties(nullptr, obs_properties_destroy), settings(settings_), weakObj(obs_object_get_weak_object(obj)), reloadCallback(reloadCallback), callback(callback_), - cb(cb_), + visUpdateCb(visUpdateCb_), minSize(minSize_) { setFrameShape(QFrame::NoFrame); @@ -198,14 +199,15 @@ OBSPropertiesView::OBSPropertiesView(OBSData settings_, obs_object_t *obj, OBSPropertiesView::OBSPropertiesView(OBSData settings_, void *obj, PropertiesReloadCallback reloadCallback, PropertiesUpdateCallback callback_, - PropertiesVisualUpdateCb cb_, int minSize_) + PropertiesVisualUpdateCb visUpdateCb_, + int minSize_) : VScrollArea(nullptr), properties(nullptr, obs_properties_destroy), settings(settings_), rawObj(obj), reloadCallback(reloadCallback), callback(callback_), - cb(cb_), + visUpdateCb(visUpdateCb_), minSize(minSize_) { setFrameShape(QFrame::NoFrame); @@ -2028,11 +2030,11 @@ void WidgetInfo::ControlChanged() blog(LOG_DEBUG, "No update timer or no callback!"); } - if (view->cb && !view->deferUpdate) { + if (view->visUpdateCb && !view->deferUpdate) { OBSObject strongObj = view->GetObject(); void *obj = strongObj ? strongObj.Get() : view->rawObj; if (obj) - view->cb(obj, view->settings); + view->visUpdateCb(obj, view->settings); } view->SignalChanged(); diff --git a/UI/properties-view.hpp b/UI/properties-view.hpp index 2ee80ded9..ab2eee675 100644 --- a/UI/properties-view.hpp +++ b/UI/properties-view.hpp @@ -102,7 +102,7 @@ private: std::string type; PropertiesReloadCallback reloadCallback; PropertiesUpdateCallback callback = nullptr; - PropertiesVisualUpdateCb cb = nullptr; + PropertiesVisualUpdateCb visUpdateCb = nullptr; int minSize; std::vector> children; std::string lastFocused;