osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Apply coloring rules also when a frame is marked so that when a frame 

is un-marked *after* enabling coloring it is still colored.

Fixes bug 2038


svn path=/trunk/; revision=23648
This commit is contained in:
Sake Blok 2007-11-28 18:02:01 +00:00
parent 2463784fbd
commit 42a968d407
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
file.c
View File

@ -1010,13 +1010,14 @@ add_packet_to_packet_list(frame_data *fdata, capture_file *cf,
row = packet_list_append(cf->cinfo.col_data, fdata);
/* colorize packet: if packet is marked, use preferences,
otherwise try to apply color filters */
/* colorize packet: first apply color filters
* then if packet is marked, use preferences to overwrite color
* we do both to make sure that when a packet gets un-marked, the
* color will be correctly set (fixes bug 2038)
*/
fdata->color_filter = color_filters_colorize_packet(row, edt);
if (fdata->flags.marked) {
fdata->color_filter = NULL;
packet_list_set_colors(row, &prefs.gui_marked_fg, &prefs.gui_marked_bg);
} else {
fdata->color_filter = color_filters_colorize_packet(row, edt);
}
/* Set the time of the previous displayed frame to the time of this