Rebase against master.

This commit is contained in:
LemonBoy 2016-06-19 21:08:25 +02:00 committed by Ailin Nemui
commit 5eaead761f
2 changed files with 5 additions and 3 deletions

View file

@ -66,8 +66,10 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
if (text == NULL)
return FALSE;
if (rec->regexp)
return rec->preg && g_regex_match(rec->preg, text, 0, NULL);
if (rec->regexp) {
return rec->preg != NULL &&
g_regex_match(rec->preg, text, 0, NULL);
}
return rec->fullword ?
stristr_full(text, rec->pattern) != NULL :