diff options
author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-04-11 04:57:43 +0000 |
---|---|---|
committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-04-11 04:57:43 +0000 |
commit | f6685bac1748b9d73b4787d6bfd966717109c5aa (patch) | |
tree | b19058e6694be8ab64a88bbce8ae1abfd3ec96cd /airpcap_loader.c | |
parent | 7571658b2825fac9e5a5a0f8613a6bc5e8e01177 (diff) |
Fix bug 1377:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1377
and complaints to the mailing list that a bogus (empty or non-ASCII contents)
dialog box was popped up when getting the list of interfaces. The problem was
that 'get_airpcap_interface_list()' wasn't setting the returned error value
when it found that AirPcap was not loaded. If whatever was in that variable
happened to be 1 when a non-AirPcap user requested the list of interfaces
then the bogus dialog would show up.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21380 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'airpcap_loader.c')
-rw-r--r-- | airpcap_loader.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/airpcap_loader.c b/airpcap_loader.c index 1e37cb6c18..e01b6bc792 100644 --- a/airpcap_loader.c +++ b/airpcap_loader.c @@ -1138,7 +1138,10 @@ get_airpcap_interface_list(int *err, char **err_str) char errbuf[PCAP_ERRBUF_SIZE]; if (!AirpcapLoaded) + { + *err = AIRPCAP_NOT_LOADED; return il; + } if (!g_PAirpcapGetDeviceList(&devsList, errbuf)) { |