Browse Source

Merge pull request #582 from Xaymar/master

libobs: Fix possible null pointer dereference
Jim 9 years ago
parent
commit
ed829e93ae
1 changed files with 2 additions and 1 deletions
  1. 2 1
      libobs/obs-properties.c

+ 2 - 1
libobs/obs-properties.c

@@ -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;