summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2014-12-20 20:09:00 +0100
committerMichal Labedzki <michal.labedzki@tieto.com>2014-12-20 20:46:21 +0000
commitb4e90bdc8e5db01a3f38fab97cc1e341288d7c0b (patch)
tree80469e3580bed66a14b286ae3a2fc86345d3a4e5 /ui
parent8b24471e62940d8a9335151809d6bc5913f94fdd (diff)
downloadwireshark-b4e90bdc8e5db01a3f38fab97cc1e341288d7c0b.tar.gz
Fix filter test for multifield custom column
This adds support for "field||field" without spaces. Change-Id: Ia738d6642d12a188d1629bbdd9701cc8f8bb7a68 Reviewed-on: https://code.wireshark.org/review/5922 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/gtk/filter_dlg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c
index 6662bd8705..c17a48c7ff 100644
--- a/ui/gtk/filter_dlg.c
+++ b/ui/gtk/filter_dlg.c
@@ -1351,7 +1351,7 @@ filter_te_syntax_check_cb(GtkWidget *w, gpointer user_data _U_)
gchar **fields;
guint i_field = 0;
- fields = g_regex_split_simple(" *([^ ]+) *(?:(?:\\|\\|)|(?:or))? *",
+ fields = g_regex_split_simple(" *([^ \\|]+) *(?:(?:\\|\\|)|(?:or))? *",
strval, G_REGEX_ANCHORED, G_REGEX_MATCH_ANCHORED);
for (i_field =0; i_field < g_strv_length(fields); i_field += 1) {