Another Laura bug: Don't reset the file load time in the status bar when
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 17 Feb 2010 23:03:41 +0000 (23:03 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 17 Feb 2010 23:03:41 +0000 (23:03 +0000)
we apply a display filter. Display the load time as "Load time:
M:SS.SSS" instead of "Time: HH:MM:SS.SSS".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31909 f5534014-38df-0310-8fa8-9805f1628bb7

file.c
gtk/main_statusbar.c

diff --git a/file.c b/file.c
index a463c8750896151024ba7f3525af9f09c9e4092d..19384e66f2a81be65ee31171d89f4ed7e7fe0fb9 100644 (file)
--- a/file.c
+++ b/file.c
@@ -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();
 
 #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();
   /*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
             /* 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();
         /*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();
 
 #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();
   /*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
   }
 
 #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();
   /*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;
 
   cf->first_displayed = NULL;
   cf->last_displayed = NULL;
 
-  reset_elapsed();
-
   /* We currently don't display any packets */
   cf->displayed_count = 0;
 
   /* We currently don't display any packets */
   cf->displayed_count = 0;
 
index 8a0d4a6769d8c05ccf6d5389fb8c63cfeca616f8..b89a5d980caecf145db246526f91eb153247617c 100644 (file)
@@ -445,10 +445,9 @@ packets_bar_update(void)
             } else {
                 gulong computed_elapsed = cf_get_computed_elapsed();
 
             } 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,
                     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);
             }
                     computed_elapsed%60000/1000,
                     computed_elapsed%1000);
             }