summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2015-11-28 20:03:46 +0100
committerStig Bjørlykke <stig@bjorlykke.org>2015-11-28 19:13:38 +0000
commit01e5ec7361429fc5ae0cb2348dba3c7d4d00fadb (patch)
treeab2a2622430ce7cd7b0dbc89143cd8a2db845601
parent92c892e1e55e348289321c52f05542ca6cfe626f (diff)
downloadwireshark-01e5ec7361429fc5ae0cb2348dba3c7d4d00fadb.tar.gz
Qt: Validate capture filter before showing packet list.
When starting a capture do validate all settings before showing the packet list. Bug: 11667 Change-Id: Ia0457b9643ca76f8d51c0a254f587398dda888d9 Reviewed-on: https://code.wireshark.org/review/12259 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 41d4dabc291757b5aa880ca98d2c3eb5d8bc3fe3) Reviewed-on: https://code.wireshark.org/review/12260
-rw-r--r--ui/qt/main_window_slots.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 60930af54c..724645f602 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -790,8 +790,6 @@ void MainWindow::startCapture() {
return;
}
- main_ui_->mainStack->setCurrentWidget(&master_split_);
-
// Ideally we should have disabled the start capture
// toolbar buttons and menu items. This may not be the
// case, e.g. with QtMacExtras.
@@ -802,6 +800,8 @@ void MainWindow::startCapture() {
return;
}
+ main_ui_->mainStack->setCurrentWidget(&master_split_);
+
/* XXX - we might need to init other pref data as well... */
/* XXX - can this ever happen? */