Passing other as NULL should not always result in a match if me matches

This commit is contained in:
Martin Willi
2009-11-12 10:34:01 +01:00
parent 947b03fd09
commit 3374cb0f44
+2 -2
View File
@@ -220,7 +220,7 @@ static bool shared_filter(shared_data_t *data,
void **unused1, id_match_t *me, void **unused1, id_match_t *me,
void **unused2, id_match_t *other) void **unused2, id_match_t *other)
{ {
id_match_t my_match = ID_MATCH_ANY, other_match = ID_MATCH_ANY; id_match_t my_match = ID_MATCH_NONE, other_match = ID_MATCH_NONE;
stroke_shared_key_t *stroke = *in; stroke_shared_key_t *stroke = *in;
shared_key_t *shared = &stroke->shared; shared_key_t *shared = &stroke->shared;
@@ -237,7 +237,7 @@ static bool shared_filter(shared_data_t *data,
{ {
other_match = stroke->has_owner(stroke, data->other); other_match = stroke->has_owner(stroke, data->other);
} }
if (!my_match && !other_match) if ((data->me || data->other) && (!my_match && !other_match))
{ {
return FALSE; return FALSE;
} }