summaryrefslogtreecommitdiff
path: root/ui/qt/main_window.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@zing.org>2015-10-03 09:45:16 -0700
committerMichael Mann <mmann78@netscape.net>2015-10-05 02:58:28 +0000
commit2496aed28eecc3466f8de49f67393b0798c664fb (patch)
tree7b805c2df25b8e78a2c5dc9d35665398b5ccda40 /ui/qt/main_window.cpp
parent05e037565902fd3043f3f475da0c7b5265d09425 (diff)
downloadwireshark-2496aed28eecc3466f8de49f67393b0798c664fb.tar.gz
Qt: Don't update the recent list while capturing.
If a recent file is on a network share we'll create traffic which can show up in the capture. This doesn't fix the issue entirely, e.g. if you're capturing in one instance of Wireshark and have another one open. The proper fix in that case is to switch to QFileSystemWatcher as described at the top of ::WiresharkApplication. Ping-Bug: 11546 Change-Id: If21f1bb213fe1d862c09b1b2edd78c8baf983461 Reviewed-on: https://code.wireshark.org/review/10774 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Diffstat (limited to 'ui/qt/main_window.cpp')
-rw-r--r--ui/qt/main_window.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index ef59ae124a..b053c0c1cf 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -396,6 +396,15 @@ MainWindow::MainWindow(QWidget *parent) :
connect(&capture_file_, SIGNAL(captureCaptureUpdateContinue(capture_session*)),
main_ui_->statusBar, SLOT(updateCaptureStatistics(capture_session*)));
+ connect(&capture_file_, SIGNAL(captureCaptureUpdateStarted(capture_session *)),
+ wsApp, SLOT(captureStarted()));
+ connect(&capture_file_, SIGNAL(captureCaptureUpdateFinished(capture_session *)),
+ wsApp, SLOT(captureFinished()));
+ connect(&capture_file_, SIGNAL(captureCaptureFixedStarted(capture_session *)),
+ wsApp, SLOT(captureStarted()));
+ connect(&capture_file_, SIGNAL(captureCaptureFixedFinished(capture_session *)),
+ wsApp, SLOT(captureFinished()));
+
connect(&capture_file_, SIGNAL(captureFileOpened()),
this, SLOT(captureFileOpened()));
connect(&capture_file_, SIGNAL(captureFileReadStarted()),