diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-12-15 19:29:21 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-12-15 19:29:21 +0000 |
| commit | 7871c54e99ed390e6c061d921b290d32103c3e0a (patch) | |
| tree | b29ecb8bc7b66c442d9d37087a8250bdccec5eec /gtk | |
| parent | ae2b555a960b14cfbc1a1ce6c440dce944bc4981 (diff) | |
| download | wireshark-7871c54e99ed390e6c061d921b290d32103c3e0a.tar.gz wireshark-7871c54e99ed390e6c061d921b290d32103c3e0a.tar.bz2 wireshark-7871c54e99ed390e6c061d921b290d32103c3e0a.zip | |
Behave more gracefully if WinPcap isn't installed. Don't assert if
we call pcap_open or pcap_open_live when WinPcap isn't loaded - just
return NULL. Don't display the "NPF driver isn't running" dialog if
we're capturing from stdin or a file.
Fix a cut-and-paste error in capture_pcap_linktype_list.
svn path=/trunk/; revision=31275
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/main.c b/gtk/main.c index a0f97057ee..2a0d98dacc 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -2665,7 +2665,7 @@ main(int argc, char *argv[]) #ifdef _WIN32 /* Warn the user if npf.sys isn't loaded. */ - if (!npf_sys_is_running() && recent.privs_warn_if_no_npf && get_os_major_version() >= 6) { + if (!stdin_capture && !cf_name && !npf_sys_is_running() && recent.privs_warn_if_no_npf && get_os_major_version() >= 6) { priv_warning_dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, "The NPF driver isn't running. You may have trouble\n" "capturing or listing interfaces."); |