From f22964da50418c6f3d7d9fef1c130d4887173351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= <stig@bjorlykke.org>
Date: Fri, 3 Mar 2017 08:52:29 +0100
Subject: [PATCH] Qt: Fix goto next/prev packet toolbar buttons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use bitwise AND to check if a modifier bit is set.

Also changed from MetaModifier to AltModifier to match the comment
and the modifier key used in "Next/Previous Packet in History".

Change-Id: I89072a1dfdd14a2beb7344a672cbc18a3ace8924
Reviewed-on: https://code.wireshark.org/review/20359
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
---
 ui/qt/packet_list.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index e3095fd3f8..29cb6c677c 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -1167,8 +1167,9 @@ void PacketList::setMonospaceFont(const QFont &mono_font)
     header()->setFont(wsApp->font());
 }
 
-void PacketList::goNextPacket(void) {
-    if (QApplication::keyboardModifiers() | Qt::MetaModifier) {
+void PacketList::goNextPacket(void)
+{
+    if (QApplication::keyboardModifiers() & Qt::AltModifier) {
         // Alt+toolbar
         goNextHistoryPacket();
         return;
@@ -1182,8 +1183,9 @@ void PacketList::goNextPacket(void) {
     }
 }
 
-void PacketList::goPreviousPacket(void) {
-    if (QApplication::keyboardModifiers() | Qt::MetaModifier) {
+void PacketList::goPreviousPacket(void)
+{
+    if (QApplication::keyboardModifiers() & Qt::AltModifier) {
         // Alt+toolbar
         goPreviousHistoryPacket();
         return;