diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-02-21 15:27:10 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-02-22 05:12:03 +0000 |
| commit | b443d4646e57012661c40011e287cb9d67245ca7 (patch) | |
| tree | d435df9757f0ac89a4c4dc717e5820d1220b9976 | |
| parent | b293c97ad3f128eb25e3af8d34549368544df708 (diff) | |
Qt+Windows: Adjust our DBAR check logic.
Don't bother fetching a file's version if its name doesn't match any of
the DBAR DLL list entries. Otherwise we try to open a bunch of DLLs we
don't care about.
Change-Id: Icab11450839195c1259bb307ae88988f52917487
Reviewed-on: https://code.wireshark.org/review/25973
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | ui/qt/wireshark_application.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index be905ea19b..04721a53a3 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -627,10 +627,11 @@ void WiresharkApplication::checkForDbar() if (inproc_default.isEmpty()) continue; foreach (QString dbar_dll, dbar_dlls) { + if (! inproc_default.contains(dbar_dll, Qt::CaseInsensitive)) continue; // XXX We don't expand environment variables in the path. unsigned int dll_version = fileVersion(inproc_default); unsigned int bad_version = 1 << 16 | 8; // Offending DBAR version is 1.8. - if (inproc_default.contains(dbar_dll, Qt::CaseInsensitive) && dll_version == bad_version) { + if (dll_version == bad_version) { QMessageBox dbar_msgbox; dbar_msgbox.setIcon(QMessageBox::Warning); dbar_msgbox.setStandardButtons(QMessageBox::Ok); |