4 files changed, 25 insertions, 0 deletions
diff --git a/ui/qt/expert_info_dialog.cpp b/ui/qt/expert_info_dialog.cpp
index 81c586576a..9f0a11e52c 100644
--- a/ui/qt/expert_info_dialog.cpp
+++ b/ui/qt/expert_info_dialog.cpp
@@ -202,6 +202,8 @@ ExpertInfoDialog::ExpertInfoDialog(QWidget &parent, CaptureFile &capture_file) :
         connect(fa, SIGNAL(triggered()), this, SLOT(filterActionTriggered()));
     }
 
+    connect(&cap_file_, SIGNAL(captureFileRetapStarted()),
+            this, SLOT(retapStarted()));
     connect(&cap_file_, SIGNAL(captureFileRetapFinished()),
             this, SLOT(retapFinished()));
     setDisplayFilter();
@@ -263,8 +265,14 @@ void ExpertInfoDialog::retapPackets()
     cap_file_.retapPackets();
 }
 
+void ExpertInfoDialog::retapStarted()
+{
+    ui->limitCheckBox->setEnabled(false);
+}
+
 void ExpertInfoDialog::retapFinished()
 {
+    ui->limitCheckBox->setEnabled(! file_closed_ && ! display_filter_.isEmpty());
     addPacketTreeItems();
     for (int i = 0; i < ui->expertInfoTreeWidget->topLevelItemCount(); i++) {
         QTreeWidgetItem *group_ti = ui->expertInfoTreeWidget->topLevelItem(i);
diff --git a/ui/qt/expert_info_dialog.h b/ui/qt/expert_info_dialog.h
index a5722cf8b3..03d6dc1215 100644
--- a/ui/qt/expert_info_dialog.h
+++ b/ui/qt/expert_info_dialog.h
@@ -89,6 +89,7 @@ private:
 
 private slots:
     void retapPackets();
+    void retapStarted();
     void retapFinished();
 
     void updateWidgets();
diff --git a/ui/qt/traffic_table_dialog.cpp b/ui/qt/traffic_table_dialog.cpp
index abfcb7b00c..5b89db9c15 100644
--- a/ui/qt/traffic_table_dialog.cpp
+++ b/ui/qt/traffic_table_dialog.cpp
@@ -86,6 +86,10 @@ TrafficTableDialog::TrafficTableDialog(QWidget &parent, CaptureFile &cf, const c
 
     connect(ui->trafficTableTabWidget, SIGNAL(currentChanged(int)),
             this, SLOT(itemSelectionChanged()));
+    connect(&cap_file_, SIGNAL(captureFileRetapStarted()),
+            this, SLOT(retapStarted()));
+    connect(&cap_file_, SIGNAL(captureFileRetapFinished()),
+            this, SLOT(retapFinished()));
 }
 
 TrafficTableDialog::~TrafficTableDialog()
@@ -177,6 +181,16 @@ void TrafficTableDialog::on_displayFilterCheckBox_toggled(bool checked)
     cap_file_.retapPackets();
 }
 
+void TrafficTableDialog::retapStarted()
+{
+    ui->displayFilterCheckBox->setEnabled(false);
+}
+
+void TrafficTableDialog::retapFinished()
+{
+    ui->displayFilterCheckBox->setEnabled(true);
+}
+
 void TrafficTableDialog::setTabText(QWidget *tree, const QString &text)
 {
     // Could use QObject::sender as well
diff --git a/ui/qt/traffic_table_dialog.h b/ui/qt/traffic_table_dialog.h
index 6d918557c6..cc7c50418e 100644
--- a/ui/qt/traffic_table_dialog.h
+++ b/ui/qt/traffic_table_dialog.h
@@ -152,6 +152,8 @@ private slots:
     void on_displayFilterCheckBox_toggled(bool checked);
     void setTabText(QWidget *tree, const QString &text);
     void toggleTable();
+    void retapStarted();
+    void retapFinished();
 
     void copyAsCsv();
     void copyAsYaml();