fix #1188: scroll the packet list to the bottom (in a running capture) *after* thawing the list - otherwise the scrolling won't be done correctly

this one should go into 0.99.4 IMHO

svn path=/trunk/; revision=19726

1 files changed, 5 insertions, 2 deletions

diff --git a/file.c b/file.c
index 62522039ef..7a292225ab 100644
--- a/file.c
+++ b/file.c
@@ -583,13 +583,16 @@ cf_continue_tail(capture_file *cf, int to_read, int *err)
   /*g_log(NULL, G_LOG_LEVEL_MESSAGE, "cf_continue_tail: count %u state: %u err: %u",
 	  cf->count, cf->state, *err);*/
 
+  packet_list_thaw();
+
+  /* moving to the end of the packet list - if the user requested so.
+     this doesn't seem to work well with a frozen GTK_Clist, so do this after
+     packet_list_thaw() is done, see bugzilla 1188 */
   /* XXX - this cheats and looks inside the packet list to find the final
      row number. */
   if (auto_scroll_live && cf->plist_end != NULL)
     packet_list_moveto_end();
 
-  packet_list_thaw();
-
   if (cf->state == FILE_READ_ABORTED) {
     /* Well, the user decided to exit Wireshark.  Return CF_READ_ABORTED
        so that our caller can kill off the capture child process;