diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2015-03-15 18:35:47 +0100 |
|---|---|---|
| committer | Michal Labedzki <michal.labedzki@tieto.com> | 2015-03-15 18:50:20 +0000 |
| commit | 80939682f9f059b7fc57b6d535fae3a55c7c7d27 (patch) | |
| tree | 3d6425c66d256fd0e789bb8ad6fc5ea42f0b7f99 /ui | |
| parent | 7696991dc8befa77556b9ebd6a64ad0f45b7d209 (diff) | |
Qt: Fix overloaded CPU
QTreeView also use timerEvent() to do something... so call its overloaded
method and make CPU happy again.
Bug: 11035
Change-Id: I405c8c2763ae0b96c0483aedcb314a5f259e76a1
Reviewed-on: https://code.wireshark.org/review/7696
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/packet_list.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index 160e28198f..5f76bb9b04 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -534,6 +534,8 @@ void PacketList::contextMenuEvent(QContextMenuEvent *event) // scrollToBottom() from rowsInserted(). void PacketList::timerEvent(QTimerEvent *event) { + QTreeView::timerEvent(event); + if (rows_inserted_ && event->timerId() == tail_timer_id_ && capture_in_progress_ @@ -692,8 +694,8 @@ void PacketList::setAutoScroll(bool enabled) tail_at_end_ = enabled; if (enabled && capture_in_progress_) { scrollToBottom(); - if (tail_timer_id_ < 1) tail_timer_id_ = startTimer(tail_update_interval_); - } else if (tail_timer_id_ > 0) { + if (tail_timer_id_ == 0) tail_timer_id_ = startTimer(tail_update_interval_); + } else if (tail_timer_id_ != 0) { killTimer(tail_timer_id_); tail_timer_id_ = 0; } |