diff options
author | Guy Harris <guy@alum.mit.edu> | 2011-12-06 07:13:40 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2011-12-06 07:13:40 +0000 |
commit | 3ac10358b5fbc35e8cad3b7bdf53bfcbddc6a99b (patch) | |
tree | 191b2882a209a476dfc00b163a29c13a91532eb4 /gtk | |
parent | e5fcc57d878e00c675f65a5a8906d0340ac53d35 (diff) | |
download | wireshark-3ac10358b5fbc35e8cad3b7bdf53bfcbddc6a99b.tar.gz wireshark-3ac10358b5fbc35e8cad3b7bdf53bfcbddc6a99b.tar.bz2 wireshark-3ac10358b5fbc35e8cad3b7bdf53bfcbddc6a99b.zip |
In capture_prep_monitor_changed_cb(), don't update the monitor mode
checkbox unless we're actually forcing it off.
Small indentation fix.
svn path=/trunk/; revision=40101
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/capture_dlg.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index df81cdb0b9..96fa94d609 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -4139,6 +4139,9 @@ capture_prep_monitor_changed_cb(GtkWidget *monitor, gpointer argp _U_) * monitor mode off. */ cap_settings.monitor_mode = FALSE; + /* Set the monitor-mode checkbox to the new forced value */ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(monitor), + cap_settings.monitor_mode); caps = capture_get_if_capabilities(if_string, cap_settings.monitor_mode, &err_str_norfmon); if (caps == NULL) { @@ -4216,11 +4219,6 @@ capture_prep_monitor_changed_cb(GtkWidget *monitor, gpointer argp _U_) } gtk_widget_set_sensitive(linktype_lb, linktype_count >= 2); gtk_widget_set_sensitive(linktype_combo_box, linktype_count >= 2); -#ifdef HAVE_PCAP_CREATE - /* Set the monitor-mode checkbox to the appropriate value */ - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(monitor), - cap_settings.monitor_mode); -#endif ws_combo_box_set_active(GTK_COMBO_BOX(linktype_combo_box),0); g_array_insert_val(rows, marked_row, row); } |