diff options
| author | Roland Knall <rknall@gmail.com> | 2019-11-07 11:52:57 +0000 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2019-11-07 12:53:56 +0000 |
| commit | 1b151d820da16deddacda9c730bacb2a4549f028 (patch) | |
| tree | 7064daae33db9b13392050d8cc92668563b59f2a /ui/qt | |
| parent | abfa0d6218108a14898778b7142c55a27d42b298 (diff) | |
Qt: Fix order of contextmenu for DisplayFilter
Put the DisplayFilter Context Menu in the correct order and fix
a null-assignement issue
Change-Id: If39c7a7ebe9bab0c6cfb790cc255d369a0055cb3
Reviewed-on: https://code.wireshark.org/review/35014
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/widgets/display_filter_edit.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/qt/widgets/display_filter_edit.cpp b/ui/qt/widgets/display_filter_edit.cpp index 0a317b4dde..baecd538bd 100644 --- a/ui/qt/widgets/display_filter_edit.cpp +++ b/ui/qt/widgets/display_filter_edit.cpp @@ -135,8 +135,8 @@ void DisplayFilterEdit::contextMenuEvent(QContextMenuEvent *event){ na->setCheckable(true); na->setChecked(leftAlignActions_); connect(na, &QAction::triggered, this, &DisplayFilterEdit::triggerAlignementAction); - - menu->insertAction(first, na); + menu->addSeparator(); + menu->addAction(na); na = new QAction(tr("Display Filter Expression" UTF8_HORIZONTAL_ELLIPSIS), this); connect(na, &QAction::triggered, this, &DisplayFilterEdit::displayFilterExpression); @@ -537,7 +537,8 @@ void DisplayFilterEdit::applyDisplayFilter() void DisplayFilterEdit::displayFilterSuccess(bool success) { - apply_button_->setEnabled(!success); + if ( apply_button_ ) + apply_button_->setEnabled(!success); } void DisplayFilterEdit::changeEvent(QEvent* event) |