Make frame_data_set_after_dissect() callers do the necessary checks instead

svn path=/trunk/; revision=30068

1 files changed, 15 insertions, 18 deletions

diff --git a/epan/frame_data.c b/epan/frame_data.c
index 768dc4776e..72dbb3e74b 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -275,25 +275,22 @@ frame_data_set_after_dissect(frame_data *fdata,
                 guint32 *cum_bytes,
                 nstime_t *prev_dis_ts)
 {
-  if(fdata->flags.passed_dfilter || fdata->flags.ref_time)
-  {
-    /* This frame either passed the display filter list or is marked as
-       a time reference frame.  All time reference frames are displayed
-       even if they dont pass the display filter */
-    if(fdata->flags.ref_time){
-      /* if this was a TIME REF frame we should reset the cul bytes field */
-      *cum_bytes = fdata->pkt_len;
-      fdata->cum_bytes = *cum_bytes;
-    } else {
-      /* increase cum_bytes with this packets length */
-      *cum_bytes += fdata->pkt_len;
-      fdata->cum_bytes = *cum_bytes;
-    }
-
-    /* Set the time of the previous displayed frame to the time of this
-       frame. */
-    *prev_dis_ts = fdata->abs_ts;
+  /* This frame either passed the display filter list or is marked as
+     a time reference frame.  All time reference frames are displayed
+     even if they dont pass the display filter */
+  if(fdata->flags.ref_time){
+    /* if this was a TIME REF frame we should reset the cul bytes field */
+    *cum_bytes = fdata->pkt_len;
+    fdata->cum_bytes = *cum_bytes;
+  } else {
+    /* increase cum_bytes with this packets length */
+    *cum_bytes += fdata->pkt_len;
+    fdata->cum_bytes = *cum_bytes;
   }
+
+  /* Set the time of the previous displayed frame to the time of this
+     frame. */
+  *prev_dis_ts = fdata->abs_ts;
 }
 
 void