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

UI: Fix context bar crash

Browse Source 
This crash was caused by the fact that the SourceToolbar::oldData member
variable was not being released correctly. To release an OBSData object,
it must be either destructed, set to a new value, or set to a null
value.
This commit is contained in:
jp9000 2021-06-10 13:51:53 -07:00
parent 3887c09066
commit 2d524580fe
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
UI/context-bar-controls.cpp
View File

@ -36,19 +36,22 @@ SourceToolbar::SourceToolbar(QWidget *parent, OBSSource source)
void SourceToolbar::SaveOldProperties(obs_source_t *source)
{
if (oldData)
obs_data_release(oldData);
oldData = obs_data_create();
obs_data_release(oldData);
obs_data_t *oldSettings = obs_source_get_settings(source);
obs_data_apply(oldData, oldSettings);
obs_data_set_string(oldData, "undo_sname", obs_source_get_name(source));
obs_data_release(oldSettings);
obs_data_release(oldData);
}
void SourceToolbar::SetUndoProperties(obs_source_t *source)
{
if (!oldData) {
blog(LOG_ERROR, "%s: somehow oldData was null.", __FUNCTION__);
return;
}
OBSBasic *main = reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
std::string scene_name =
@ -88,7 +91,7 @@ void SourceToolbar::SetUndoProperties(obs_source_t *source)
obs_data_release(new_settings);
obs_data_release(curr_settings);
obs_data_release(oldData);
oldData = nullptr;
}
/* ========================================================================= */