From 1b151d820da16deddacda9c730bacb2a4549f028 Mon Sep 17 00:00:00 2001 From: Roland Knall Date: Thu, 7 Nov 2019 11:52:57 +0000 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall --- ui/qt/widgets/display_filter_edit.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ui/qt') 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) -- cgit v1.2.3