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

libobs: Fix groups not being recognized as groups

Browse Source 
The id of the source was being pointer compared rather than string
compared, so naturally with the source versioning system where the
string is duplicated, the pointers no longer matched.
This commit is contained in:
jp9000 2020-03-09 17:08:51 -07:00
parent 19068c2960
commit 3992bd247c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libobs/obs-scene.c
View File

@ -86,7 +86,7 @@ static void *scene_create(obs_data_t *settings, struct obs_source *source)
struct obs_scene *scene = bzalloc(sizeof(struct obs_scene));
scene->source = source;
if (source->info.id == group_info.id) {
if (strcmp(source->info.id, group_info.id) == 0) {
scene->is_group = true;
scene->custom_size = true;
scene->cx = 0;
@ -737,7 +737,7 @@ static void scene_load_item(struct obs_scene *scene, obs_data_t *item_data)
return;
}
item->is_group = source->info.id == group_info.id;
item->is_group = strcmp(source->info.id, group_info.id) == 0;
obs_data_set_default_int(item_data, "align",
OBS_ALIGN_TOP | OBS_ALIGN_LEFT);
@ -1691,7 +1691,7 @@ static obs_sceneitem_t *obs_scene_add_internal(obs_scene_t *scene,
item->actions_mutex = mutex;
item->user_visible = true;
item->locked = false;
item->is_group = source->info.id == group_info.id;
item->is_group = strcmp(source->info.id, group_info.id) == 0;
item->private_settings = obs_data_create();
item->toggle_visibility = OBS_INVALID_HOTKEY_PAIR_ID;
os_atomic_set_long(&item->active_refs, 1);
@ -2983,7 +2983,7 @@ obs_sceneitem_t *obs_sceneitem_get_group(obs_scene_t *scene,
bool obs_source_is_group(const obs_source_t *source)
{
return source && source->info.id == group_info.id;
return source && strcmp(source->info.id, group_info.id) == 0;
}
bool obs_scene_is_group(const obs_scene_t *scene)