diff options
| author | Gerald Combs <gerald@wireshark.org> | 2006-02-16 15:53:48 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2006-02-16 15:53:48 +0000 |
| commit | e8860e5a95cd4ef9185de925eb8372b9b188b8af (patch) | |
| tree | a581c2479f33cf145c91aee1b29bbefa0a278f36 | |
| parent | e01dfff7ce51b0351afc2c21eefe865a25ba1768 (diff) | |
Freeze and thaw the packet list after a merge so that the packet list shows
the correct information.
svn path=/trunk/; revision=17320
| -rw-r--r-- | gtk/file_dlg.c | 2 |
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, |