diff options
author | sake <sake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-11-25 12:36:33 +0000 |
---|---|---|
committer | sake <sake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-11-25 12:36:33 +0000 |
commit | f1bce0727068af70ad526692ee60bfb8aa23639a (patch) | |
tree | d372299131746243c612330967557a74f0568b4d /color_filters.c | |
parent | 05bbeacee0a67d854ab0a988e11b23cb82849111 (diff) |
Fixes crashing when opening color filters and pressing OK
(introduced in SVN 23560)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23582 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'color_filters.c')
-rw-r--r-- | color_filters.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/color_filters.c b/color_filters.c index 18a02422c3..24dee0aab9 100644 --- a/color_filters.c +++ b/color_filters.c @@ -313,21 +313,23 @@ color_filter_validate_cb(gpointer filter_arg, gpointer unused _U_) /* apply changes from the edit list */ void -color_filters_apply(GSList *cfl) +color_filters_apply(GSList *tmp_cfl, GSList *edit_cfl) { /* "move" old entries to the deleted list * we must keep them until the dissection no longer needs them */ color_filter_deleted_list = g_slist_concat(color_filter_deleted_list, color_filter_list); color_filter_list = NULL; - /* clone all list entries from edit to normal list */ + /* clone all list entries from tmp/edit to normal list */ color_filter_valid_list = NULL; - color_filter_valid_list = color_filter_list_clone(cfl); + color_filter_valid_list = color_filter_list_clone(tmp_cfl); + color_filter_valid_list = g_slist_concat(color_filter_valid_list, + color_filter_list_clone(edit_cfl) ); /* compile all filter */ g_slist_foreach(color_filter_valid_list, color_filter_validate_cb, NULL); - /* clone all list entries from edit to normal list */ + /* clone all list entries from tmp/edit to normal list */ color_filter_list = color_filter_list_clone(color_filter_valid_list); /* compile all filter */ |