summaryrefslogtreecommitdiff
path: root/ui/qt/main_window_slots.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-08-26 12:48:56 -0700
committerGerald Combs <gerald@wireshark.org>2015-08-27 21:27:32 +0000
commit01fb470acd71528bede068727b7614ae6f534c4f (patch)
tree16b297e130a98ab86f22edac6a222117f220e7ee /ui/qt/main_window_slots.cpp
parent30c2f23f057407eefbc4f852da71bdbac6fc6e63 (diff)
downloadwireshark-01fb470acd71528bede068727b7614ae6f534c4f.tar.gz
More retapping fixups.
Disable the main file close and reload actions while we're retapping, otherwise many of our dialogs will crash. Disable the TapParameterDialog filter entry while we're retapping. This keeps us from enabling the "Apply" button when we shouldn't. Don't prematurely disconnect our signals in WiresharkDialog. Change-Id: Iaf507eb4503b9c296766f109f2b8c71343263982 Reviewed-on: https://code.wireshark.org/review/10274 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_window_slots.cpp')
-rw-r--r--ui/qt/main_window_slots.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 599edc738d..46f2c03439 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -677,6 +677,19 @@ void MainWindow::captureFileReadFinished() {
emit setDissectedCaptureFile(capture_file_.capFile());
}
+void MainWindow::captureFileRetapStarted()
+{
+ // XXX Push a status message?
+ main_ui_->actionFileClose->setEnabled(false);
+ main_ui_->actionViewReload->setEnabled(false);
+}
+
+void MainWindow::captureFileRetapFinished()
+{
+ main_ui_->actionFileClose->setEnabled(true);
+ main_ui_->actionViewReload->setEnabled(true);
+}
+
void MainWindow::captureFileClosing() {
setMenusForCaptureFile(true);
setForCapturedPackets(false);