diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-03-14 13:29:21 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-03-15 05:02:21 +0000 |
| commit | 54fc0046cb87405f1b650c3c10ae6701d8d00505 (patch) | |
| tree | 8327d62065c8d3cdd9782fd5b6c68d84150db04b /ui/qt/wireless_frame.cpp | |
| parent | 4aafd44e31cd5507fe60163433531cf95c1a418a (diff) | |
| download | wireshark-54fc0046cb87405f1b650c3c10ae6701d8d00505.tar.gz | |
Qt: Make sure the proto tree handles all of its timers.
Call QTreeWidget::timerEvent from ProtoTree::timerEvent, otherwise we
turn into the candy factory episode in I Love Lucy.
Do the equivalent in WirelessFrame while we're here. Neither QFrame or
QWidget use timers, but there's no guarantee that this will be the case
in the future.
Bug: 12258
Change-Id: I3cb0096fe2ed87176fec8d7361260b5388d75530
Reviewed-on: https://code.wireshark.org/review/14470
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/wireless_frame.cpp')
| -rw-r--r-- | ui/qt/wireless_frame.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp index 5514944a98..5780cd86da 100644 --- a/ui/qt/wireless_frame.cpp +++ b/ui/qt/wireless_frame.cpp @@ -97,8 +97,11 @@ void WirelessFrame::setCaptureInProgress(bool capture_in_progress) // Check to see if the ws80211 interface list matches the one in our // combobox. Rebuild ours if necessary and select the first interface if // the current selection goes away. -void WirelessFrame::timerEvent(QTimerEvent *) +void WirelessFrame::timerEvent(QTimerEvent *event) { + // Probably not needed. + QFrame::timerEvent(event); + // Don't interfere with user activity. if (ui->interfaceComboBox->view()->isVisible() || ui->channelComboBox->view()->isVisible() |