diff options
| -rw-r--r-- | file.c | 10 | ||||
| -rw-r--r-- | gtk/main_statusbar.c | 5 |
2 files changed, 6 insertions, 9 deletions
@@ -792,7 +792,7 @@ cf_continue_tail(capture_file *cf, volatile int to_read, int *err) #ifdef NEW_PACKET_LIST new_packet_list_check_end(); - /* Don't freeze/thaw the list when doing live capture */ + /* Don't freeze/thaw the list when doing live capture */ /*new_packet_list_freeze();*/ #else packet_list_check_end(); @@ -839,7 +839,7 @@ cf_continue_tail(capture_file *cf, volatile int to_read, int *err) /* Sleep(100); */ }; #ifdef NEW_PACKET_LIST - /* Don't freeze/thaw the list when doing live capture */ + /* Don't freeze/thaw the list when doing live capture */ /*new_packet_list_thaw();*/ #else packet_list_thaw(); @@ -933,7 +933,7 @@ cf_finish_tail(capture_file *cf, int *err) #ifdef NEW_PACKET_LIST new_packet_list_check_end(); - /* Don't freeze/thaw the list when doing live capture */ + /* Don't freeze/thaw the list when doing live capture */ /*new_packet_list_freeze();*/ #else packet_list_check_end(); @@ -956,7 +956,7 @@ cf_finish_tail(capture_file *cf, int *err) } #ifdef NEW_PACKET_LIST - /* Don't freeze/thaw the list when doing live capture */ + /* Don't freeze/thaw the list when doing live capture */ /*new_packet_list_thaw();*/ #else packet_list_thaw(); @@ -1777,8 +1777,6 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, cf->first_displayed = NULL; cf->last_displayed = NULL; - reset_elapsed(); - /* We currently don't display any packets */ cf->displayed_count = 0; diff --git a/gtk/main_statusbar.c b/gtk/main_statusbar.c index 8a0d4a6769..b89a5d980c 100644 --- a/gtk/main_statusbar.c +++ b/gtk/main_statusbar.c @@ -445,10 +445,9 @@ packets_bar_update(void) } else { gulong computed_elapsed = cf_get_computed_elapsed(); - packets_str = g_strdup_printf(" Packets: %u Displayed: %u Marked: %u Time: %02lu:%02lu:%02lu.%03lu", + packets_str = g_strdup_printf(" Packets: %u Displayed: %u Marked: %u Load time: %lu:%02lu.%03lu", cfile.count, cfile.displayed_count, cfile.marked_count, - computed_elapsed/3600000, - computed_elapsed%3600000/60000, + computed_elapsed/60000, computed_elapsed%60000/1000, computed_elapsed%1000); } |