From 7c40580584eac67a23633e58810028dddc58781c Mon Sep 17 00:00:00 2001 From: Roland Knall Date: Sun, 12 Nov 2017 21:39:25 +0100 Subject: Qt: Really fix the packet list selection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Really fix the selection of a row in the packet list Change-Id: I87ab36146bd9b2a130f443717ce73609a1c0b656 Reviewed-on: https://code.wireshark.org/review/24397 Reviewed-by: Roland Knall Petri-Dish: Roland Knall Reviewed-by: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- ui/qt/packet_list.cpp | 4 ++-- ui/qt/utils/frame_information.cpp | 4 ++-- ui/qt/utils/frame_information.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index 393f2d457e..20d9edf742 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -484,7 +484,7 @@ void PacketList::selectionChanged (const QItemSelection & selected, const QItemS if (!cap_file_) return; - int row = 0; + int row = -1; if (selected.isEmpty()) { cf_unselect_packet(cap_file_); @@ -593,7 +593,7 @@ void PacketList::contextMenuEvent(QContextMenuEvent *event) if ( frameData ) emit frameSelected(frameData->frameNum()); else - emit frameSelected(0); + emit frameSelected(-1); ctx_menu_.exec(event->globalPos()); ctx_column_ = -1; diff --git a/ui/qt/utils/frame_information.cpp b/ui/qt/utils/frame_information.cpp index 303076bdfe..c81b6736c2 100644 --- a/ui/qt/utils/frame_information.cpp +++ b/ui/qt/utils/frame_information.cpp @@ -89,10 +89,10 @@ frame_data * FrameInformation::frameData() const return fi_; } -unsigned int FrameInformation::frameNum() const +int FrameInformation::frameNum() const { if ( ! fi_ ) - return 0; + return -1; return fi_->num; } diff --git a/ui/qt/utils/frame_information.h b/ui/qt/utils/frame_information.h index 01a2234150..86b4858852 100644 --- a/ui/qt/utils/frame_information.h +++ b/ui/qt/utils/frame_information.h @@ -49,7 +49,7 @@ public: bool isValid(); frame_data * frameData() const; - unsigned int frameNum() const; + int frameNum() const; QByteArray printableData(); -- cgit v1.2.3