diff options
author | Martin Kaiser <wireshark@kaiser.cx> | 2016-07-13 23:21:35 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-07-16 06:42:44 +0000 |
commit | 7e5cbf4e2cd18f2244b26470df05a93c5a923afe (patch) | |
tree | cb150d749f2937f3df749d8107898a75a53bdc46 | |
parent | 5c99fc2b53ca741bc3018cb5218e3ae5b35bca70 (diff) | |
download | wireshark-7e5cbf4e2cd18f2244b26470df05a93c5a923afe.tar.gz |
always update the status bar at the end of a capture
We used to update the status bar when we get a stopCapture signal.
This does not work for extcap interfaces like randpktdump which
creates 1000 packets and then exits. The status bar message "Live capture
in progress" is not deleted.
For randpktdump, the only reliable indication to detect the end of
the "capture" is when the pipe to dumpcap is destroyed. Update the
status bar at this time.
Change-Id: I59768e7f518625283b2c27c34c428bb115e27a61
Reviewed-on: https://code.wireshark.org/review/16479
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | ui/qt/main_window_slots.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 7d375c9b6a..7bbdf11ba6 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -978,7 +978,11 @@ void MainWindow::pipeActivated(int source) { #endif // _WIN32 } -void MainWindow::pipeNotifierDestroyed() { +void MainWindow::pipeNotifierDestroyed() +{ + /* Pop the "<live capture in progress>" message off the status bar. */ + main_ui_->statusBar->setFileName(capture_file_); + #ifdef _WIN32 pipe_timer_ = NULL; #else @@ -996,8 +1000,6 @@ void MainWindow::stopCapture() { capture_stop(&cap_session_); #endif // HAVE_LIBPCAP - /* Pop the "<live capture in progress>" message off the status bar. */ - main_ui_->statusBar->setFileName(capture_file_); } // Keep focus rects from showing through the welcome screen. Primarily for |