Wireshark · Ethereal-dev: [Ethereal-dev] Capture dialog's name resolution options improperly set

[Charles Levert <chuck@xxxxxxxxxxxxxxxx>]

Hi.

This little bug has been nagging me for a long time... so here's a patch.

I also included a change that's purely related to coding style and I
know this is sometimes frowned upon, but this is the same function and
I just couldn't resist.



[ Generated with ude,
    the unified-format diff-output ("unidiff") editor,
    version 0.1 of 2004-10-13.  ]
--- gtk/capture_dlg.c.orig-0.10.7	2004-10-20 18:34:30 -0400
+++ gtk/capture_dlg.c	2004-10-22 00:48:46 -0400
@@ -4 +4 @@
  * $Id: capture_dlg.c 12272 2004-10-12 06:11:30Z ulfl $
@@ -1222,2 +1222,3 @@
 static void
-capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) {
+capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
+{
@@ -1370,7 +1371,7 @@ capture_prep_ok_cb(GtkWidget *ok_bt _U_,
   capture_opts.show_info =
       !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(hide_info_cb));
 
-  g_resolv_flags |= g_resolv_flags & RESOLV_CONCURRENT;
+  g_resolv_flags = prefs.name_resolve & RESOLV_CONCURRENT;
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_resolv_cb)))
     g_resolv_flags |= RESOLV_MAC;
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(n_resolv_cb)))