diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2016-06-16 15:09:56 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-22 07:49:02 +0000 |
| commit | d46daa1177bfd58a7fed7ecc59ee5b0b54c26a3a (patch) | |
| tree | 9b982a73c613c8d7ef894d2354def322433fea36 /ui/gtk | |
| parent | 0bf1cb2342e5becdda56be41f0347068549a77fe (diff) | |
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>
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/macros_dlg.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/gtk/macros_dlg.c b/ui/gtk/macros_dlg.c index 3315976cf7..f543e1017a 100644 --- 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"); } |