Merge pull request #582 from Xaymar/master

libobs: Fix possible null pointer dereference
This commit is contained in:
Jim 2016-08-02 12:11:22 -07:00 committed by GitHub
commit ed829e93ae

View File

@ -585,7 +585,8 @@ bool obs_property_button_clicked(obs_property_t *p, void *obj)
struct button_data *data = get_type_data(p,
OBS_PROPERTY_BUTTON);
if (data && data->callback)
return data->callback(p->parent, p, context->data);
return data->callback(p->parent, p,
(context ? context->data : NULL));
}
return false;