GTK: Keep display filter applied when switching profiles

Bug: 6130
Change-Id: I3bcd6aaad33482474e3429e0dcc074973a338fca
Reviewed-on: https://code.wireshark.org/review/15992
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/ui/gtk/macros_dlg.c b/ui/gtk/macros_dlg.c
index 3315976cf7b6a00cf1a0cfc24215d2ea4a34effa..f543e1017ab73093480939451caf8671c54746fe 100644 (file)
--- a/ui/gtk/macros_dlg.c
+++ b/ui/gtk/macros_dlg.c
@@ -33,8 +33,14 @@
 #include "ui/gtk/gtkglobals.h"
 
 void macros_post_update(void) {
-       g_free (cfile.dfilter);
-       cfile.dfilter = NULL;
+       dfilter_t *dfp;
+       /* invalidate filter if it stops being valid */
+       if (!dfilter_compile(cfile.dfilter, &dfp, NULL)) {
+               g_free(cfile.dfilter);
+               cfile.dfilter = NULL;
+       } else if (dfp) {
+               g_free(dfp);
+       }
        g_signal_emit_by_name(main_display_filter_widget, "changed");
 }