diff options
| author | Sake Blok <sake@euronet.nl> | 2007-11-26 09:10:37 +0000 |
|---|---|---|
| committer | Sake Blok <sake@euronet.nl> | 2007-11-26 09:10:37 +0000 |
| commit | 24c8b3a4b704fad79ef88f0e3d44d6e6f9deaeb1 (patch) | |
| tree | 8df49fdefae92c9bd5932c7470787bf5e587c5ea /gtk/menu.c | |
| parent | b19c9f164e2cc70ea20c34f7a14e4b43abe59b83 (diff) | |
Check if a packet is selected before trying to build a display filter based
on the "selected" packet. Fixes bug 2020.
svn path=/trunk/; revision=23596
Diffstat (limited to 'gtk/menu.c')
| -rw-r--r-- | gtk/menu.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/gtk/menu.c b/gtk/menu.c index 7811b4c1bc..09a4d33783 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -368,16 +368,18 @@ conversation_cb(GtkWidget * w, gpointer data _U_, int action) gchar *filter; GtkWidget *filter_te; - /* create a filter-string based on the selected packet and action */ - filter = build_conversation_filter(action, TRUE); + if (cfile.finfo_selected) { + /* create a filter-string based on the selected packet and action */ + filter = build_conversation_filter(action, TRUE); - /* Run the display filter so it goes in effect - even if it's the - same as the previous display filter. */ - filter_te = OBJECT_GET_DATA(w, E_DFILTER_TE_KEY); - gtk_entry_set_text(GTK_ENTRY(filter_te), filter); - main_filter_packets(&cfile, filter, TRUE); + /* Run the display filter so it goes in effect - even if it's the + same as the previous display filter. */ + filter_te = OBJECT_GET_DATA(w, E_DFILTER_TE_KEY); + gtk_entry_set_text(GTK_ENTRY(filter_te), filter); + main_filter_packets(&cfile, filter, TRUE); - g_free(filter); + g_free(filter); + } } void @@ -388,7 +390,7 @@ colorize_conversation_cb(GtkWidget * w _U_, gpointer data _U_, int action) if( (action>>8) == 255 ) { color_filters_reset_tmp(); cf_colorize_packets(&cfile); - } else { + } else if (cfile.finfo_selected) { if( (action&0xff) == 0 ) { /* colorize_conversation_cb was called from the window-menu * or through an accelerator key. Try to build a conversation |