From Didier Gautheron via bug 3391:

when loading files > 50 MB wireshark redraws the first pane on each
update_progress_dlg(). If auto_scroll_live is not set that's mean it redraws
the same rows again and again.

The patch attached only redraws it once or if cf->displayed_count < 1000, in
case you have a very big screen.


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

1 files changed, 10 insertions, 6 deletions

diff --git a/file.c b/file.c
index e8f27327cf..74399d7a48 100644
--- a/file.c
+++ b/file.c
@@ -415,6 +415,7 @@ cf_read(capture_file *cf)
   volatile gint64 progbar_nextstep;
   volatile gint64 progbar_quantum;
   dfilter_t   *dfcode;
+  volatile int displayed_once = 0;
 
   /* Compile the current display filter.
    * We assume this will not fail since cf->dfilter is only set in
@@ -486,14 +487,17 @@ cf_read(capture_file *cf)
               progbar_val = 1.0f;
           }
           if (progbar != NULL) {
-          	/* update the packet lists content on the first run or frequently on very large files */
+              /* update the packet lists content on the first run or frequently on very large files */
               /* (on smaller files the display update takes longer than reading the file) */
 #ifdef HAVE_LIBPCAP
-              if(progbar_quantum > 500000 || progbar_nextstep == 0) {
-            packet_list_thaw();
-            if (auto_scroll_live && cf->plist_end != NULL)
-              packet_list_moveto_end();
-            packet_list_freeze();
+              if (progbar_quantum > 500000 || displayed_once == 0) {
+                  if ((auto_scroll_live || displayed_once == 0 || cf->displayed_count < 1000) && cf->plist_end != NULL) {
+                      displayed_once = 1;
+                      packet_list_thaw();
+                      if (auto_scroll_live)
+                          packet_list_moveto_end();
+                      packet_list_freeze();
+                  }
               }
 #endif