aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/file_dlg.c
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2006-02-16 15:53:48 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2006-02-16 15:53:48 +0000
commitfe86e9ef4200e70aedb937e66a55e007ed82d819 (patch)
treea581c2479f33cf145c91aee1b29bbefa0a278f36 /gtk/file_dlg.c
parent13ce5926fd84e28301950bbc7cbda55bcba77589 (diff)
Freeze and thaw the packet list after a merge so that the packet list shows
the correct information. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17320 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/file_dlg.c')
-rw-r--r--gtk/file_dlg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index afa732fd67..3042fdcdf8 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -762,6 +762,8 @@ file_merge_cmd(GtkWidget *w)
{
#if GTK_MAJOR_VERSION >= 2 && _WIN32
win32_merge_file(GDK_WINDOW_HWND(top_level->window));
+ packet_list_freeze();
+ packet_list_thaw();
#else /* GTK_MAJOR_VERSION >= 2 && _WIN32 */
GtkWidget *main_hb, *main_vb, *ft_hb, *ft_lb, *filter_hbox,
*filter_bt, *filter_te, *prepend_rb, *chrono_rb,