osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Gerald Combs 2015-08-20 10:05:39 -07:00 committed by Stig Bjørlykke
parent 829c64864c
commit 37a737f6d1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/qt/display_filter_edit.cpp
View File

@ -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;
}