summaryrefslogtreecommitdiff
path: root/ui/iface_lists.c
diff options
context:
space:
mode:
authorIrene RĂ¼ngeler <I.Ruengeler@fh-muenster.de>2013-05-21 14:17:42 +0000
committerIrene RĂ¼ngeler <I.Ruengeler@fh-muenster.de>2013-05-21 14:17:42 +0000
commitaaa1f1bef946e626fcb3395b241a49280b04fb59 (patch)
tree472355adc871ffada88e6a83300ed88e2631f3dc /ui/iface_lists.c
parent1bdf3446c5ef9bbe1d7cfc6a8b488ce9d3b57e7d (diff)
downloadwireshark-aaa1f1bef946e626fcb3395b241a49280b04fb59.tar.gz
Only overwrite the scanned link layer properties if they are specified by command line options.
svn path=/trunk/; revision=49482
Diffstat (limited to 'ui/iface_lists.c')
-rw-r--r--ui/iface_lists.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/iface_lists.c b/ui/iface_lists.c
index 0e79bcb1fe..bbd8041a69 100644
--- a/ui/iface_lists.c
+++ b/ui/iface_lists.c
@@ -272,7 +272,9 @@ scan_local_interfaces(void)
device.has_snaplen = interface_opts.has_snaplen;
device.snaplen = interface_opts.snaplen;
device.cfilter = g_strdup(interface_opts.cfilter);
- device.active_dlt = interface_opts.linktype;
+ if (interface_opts.linktype != -1) {
+ device.active_dlt = interface_opts.linktype;
+ }
device.selected = TRUE;
global_capture_opts.num_selected++;
break;