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

Qt/Bluetooth: Disable go to packet for closed files 

Go to packet on close files is not valid (for currently open one).
Disable it.

Change-Id: Ib7b65c9ea7e94857692c8ac5ddd3971c52ac717f
Reviewed-on: https://code.wireshark.org/review/11023
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Michal Labedzki 2015-09-22 10:30:42 +02:00 committed by Anders Broman
parent 1479d6d48c
commit cd5706cb56
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/qt/bluetooth_att_server_attributes_dialog.cpp
View File

@ -222,6 +222,9 @@ gboolean BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet
QString uuid_name;
gchar *addr = NULL;
if (dialog->file_closed_)
return FALSE;
if (pinfo->phdr->presence_flags & WTAP_HAS_INTERFACE_ID) {
gchar *interface;
const char *interface_name;
@ -302,7 +305,7 @@ void BluetoothAttServerAttributesDialog::removeDuplicatesStateChanged(int)
void BluetoothAttServerAttributesDialog::on_tableTreeWidget_itemActivated(QTreeWidgetItem *item, int)
{
if (!cap_file_.isValid())
if (file_closed_)
return;
guint32 frame_number = item->data(0, Qt::UserRole).value<guint32>();

5
ui/qt/bluetooth_devices_dialog.cpp
View File

@ -202,6 +202,9 @@ gboolean BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo
const gchar *manuf;
QTreeWidgetItem *item = NULL;
if (dialog->file_closed_)
return FALSE;
if (pinfo->phdr->presence_flags & WTAP_HAS_INTERFACE_ID) {
gchar *interface;
const char *interface_name;
@ -315,7 +318,7 @@ void BluetoothDevicesDialog::showInformationStepsChanged(int)
void BluetoothDevicesDialog::on_tableTreeWidget_itemActivated(QTreeWidgetItem *item, int)
{
if (!cap_file_.isValid())
if (file_closed_)
return;
item_data_t *item_data = item->data(0, Qt::UserRole).value<item_data_t *>();

5
ui/qt/bluetooth_hci_summary_dialog.cpp
View File

@ -299,6 +299,9 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi
QString adapter;
QString name;
if (dialog->file_closed_)
return FALSE;
name = tr("Unknown");
if (pinfo->phdr->presence_flags & WTAP_HAS_INTERFACE_ID) {
@ -625,7 +628,7 @@ void BluetoothHciSummaryDialog::adapterCurrentIndexChanged(int)
void BluetoothHciSummaryDialog::on_tableTreeWidget_itemActivated(QTreeWidgetItem *item, int)
{
if (!cap_file_.isValid())
if (file_closed_)
return;
item_data_t *item_data = item->data(0, Qt::UserRole).value<item_data_t *>();