aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-08-20 10:05:39 -0700
committerStig Bjørlykke <stig@bjorlykke.org>2015-08-20 17:49:12 +0000
commit37a737f6d17da822cf9e2b06adc4ae7a4a57c01f (patch)
treef78b467ad4f6e0bb141993ffb62e142699f134bf
parent829c64864cfc366f431a2986c3c24672ea9ce7b0 (diff)
Make sure we can apply deprecated display filters.
Deprecated filters are still valid. Update display filter checks to make sure we can apply them. Bug: 11438 Change-Id: Ib5e009c070b40912434e0ffd771203ed1e1ba093 Reviewed-on: https://code.wireshark.org/review/10154 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-rw-r--r--ui/qt/display_filter_edit.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/display_filter_edit.cpp b/ui/qt/display_filter_edit.cpp
index 6ac78e73ca..620599e306 100644
--- a/ui/qt/display_filter_edit.cpp
+++ b/ui/qt/display_filter_edit.cpp
@@ -309,7 +309,7 @@ bool DisplayFilterEdit::checkFilter()
{
checkFilter(text());
- return (syntaxState() == Valid || syntaxState() == Empty);
+ return syntaxState() != Invalid;
}
void DisplayFilterEdit::checkFilter(const QString& text)
@@ -348,7 +348,7 @@ void DisplayFilterEdit::checkFilter(const QString& text)
bookmark_button_->setEnabled(syntaxState() == Valid || syntaxState() == Deprecated);
}
if (apply_button_) {
- apply_button_->setEnabled(SyntaxState() != Invalid);
+ apply_button_->setEnabled(syntaxState() != Invalid);
}
}
@@ -457,7 +457,7 @@ void DisplayFilterEdit::clearFilter()
void DisplayFilterEdit::applyDisplayFilter()
{
- if (syntaxState() != Valid && syntaxState() != Empty) {
+ if (syntaxState() == Invalid) {
return;
}