From Cal Turney:

 Wireshark crashes when switching from a v1.11.0 profile to a v1.4.6 prof and then to a v1.5.1 profile.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8884

#BACKPORT 1.10

svn path=/trunk/; revision=50455

2 files changed, 31 insertions, 17 deletions

diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index 3c4716de63..c5f55ce1ff 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -5575,7 +5575,7 @@ create_and_fill_model(GtkTreeView *view)
         temp = g_strdup_printf("<b>%s</b>\n<span size='small'>%s</span>", device.display_name, device.addresses);
       }
       linkname = NULL;
-      if(global_capture_session.session_started == FALSE && capture_dev_user_linktype_find(device.name) != -1) {
+      if(capture_dev_user_linktype_find(device.name) != -1) {
         device.active_dlt = capture_dev_user_linktype_find(device.name);
       }
       for (list = device.links; list != NULL; list = g_list_next(list)) {
@@ -5588,22 +5588,21 @@ create_and_fill_model(GtkTreeView *view)
       if (!linkname)
           linkname = g_strdup("unknown");
       pmode = capture_dev_user_pmode_find(device.name);
-      if (global_capture_session.session_started == FALSE && pmode != -1) {
+      if (pmode != -1) {
         device.pmode = pmode;
       }
-      if(global_capture_session.session_started == FALSE) {
-        hassnap = capture_dev_user_hassnap_find(device.name);
-        snaplen = capture_dev_user_snaplen_find(device.name);
-        if(snaplen != -1 && hassnap != -1) {
-          /* Default snap lenght set in preferences */
-          device.snaplen = snaplen;
-          device.has_snaplen = hassnap;
-        } else {
-          /* No preferences set yet, use default values */
-          device.snaplen = WTAP_MAX_PACKET_SIZE;
-          device.has_snaplen = FALSE;
-        }
+      hassnap = capture_dev_user_hassnap_find(device.name);
+      snaplen = capture_dev_user_snaplen_find(device.name);
+      if(snaplen != -1 && hassnap != -1) {
+        /* Default snap lenght set in preferences */
+        device.snaplen = snaplen;
+        device.has_snaplen = hassnap;
+      } else {
+        /* No preferences set yet, use default values */
+        device.snaplen = WTAP_MAX_PACKET_SIZE;
+        device.has_snaplen = FALSE;
       }
+      
       if (device.has_snaplen) {
         snaplen_string = g_strdup_printf("%d", device.snaplen);
       } else {
@@ -5611,10 +5610,10 @@ create_and_fill_model(GtkTreeView *view)
       }
 
 #if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
-      if (global_capture_session.session_started == FALSE && capture_dev_user_buffersize_find(device.name) != -1) {
+      if (capture_dev_user_buffersize_find(device.name) != -1) {
         buffer = capture_dev_user_buffersize_find(device.name);
         device.buffer = buffer;
-      } else if (global_capture_session.session_started == FALSE) {
+      } else {
         device.buffer = DEFAULT_CAPTURE_BUFFER_SIZE;
       } 
 #endif
diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c
index bf1ffed455..546b98a374 100644
--- a/ui/gtk/prefs_capture.c
+++ b/ui/gtk/prefs_capture.c
@@ -365,7 +365,7 @@ colopts_edit_cb(GtkWidget *w, gpointer data _U_)
 	GtkWidget	*colopts_edit_dlg, *main_hb, *main_grid,
 						*ed_opts_fr, *main_vb,
 						*bbox, *ok_bt, *cancel_bt, *help_bt, *column_lb,
-						*col_link_lb,
+						*col_interface_lb, *col_link_lb,
 #ifdef HAVE_PCAP_CREATE
 						*col_monitor_lb,
 #endif
@@ -420,6 +420,21 @@ colopts_edit_cb(GtkWidget *w, gpointer data _U_)
 	gtk_widget_show(column_lb);
 	row++;
 
+	/* create "Interface" label and button */
+	col_interface_cb = gtk_check_button_new();
+	ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), col_interface_cb, 0, row, 1, 1);
+	if (!prefs.capture_columns || prefs_capture_options_dialog_column_is_visible("INTERFACE"))
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(col_interface_cb), TRUE);
+	else
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(col_interface_cb), FALSE);
+	gtk_widget_show(col_interface_cb);
+
+	col_interface_lb = gtk_label_new("Interface name");
+	ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), col_interface_lb, 1, row, 1, 1);
+	gtk_misc_set_alignment(GTK_MISC(col_interface_lb), 0, 0.5f);
+	gtk_widget_show(col_interface_lb);
+	row++;
+
 	/* create "Link Layer" label and button */
 	col_link_cb = gtk_check_button_new();
 	ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), col_link_cb, 0, row, 1, 1);