diff options
Diffstat (limited to 'wiretap/merge.c')
| -rw-r--r-- | wiretap/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/merge.c b/wiretap/merge.c index 0f3c801740..efe4089ead 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -910,7 +910,7 @@ merge_process_packets(wtap_dumper *pdh, const int file_type, *err_framenum = 0; } else { *err_fileno = (guint)(in_file - in_files); - *err_framenum = in_file ? in_file->packet_num : 0; + *err_framenum = in_file->packet_num; } return status; |