aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2018-01-03 10:00:39 +0100
committerStig Bjørlykke <stig@bjorlykke.org>2018-01-03 09:37:32 +0000
commita382ed35fed2b1104fc588e5d665be76af42cd98 (patch)
tree00d95a7e8b661166800b1abd6c1e9a820622a4f9
parent4f146fa95f21f01ad09e62a3dcc557b1a355a64c (diff)
Qt: Fix CaptureEvent::Reload event handling
Fix an error introduced in signal/slot redesign in gd5d81518. This error disabled all capture file menu items after doing a rescan, like when adding a display filter. Change-Id: Ib468051c15b9f1a15faa2ed07b958340b82a662b Reviewed-on: https://code.wireshark.org/review/25116 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-rw-r--r--ui/qt/main_window_slots.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 71fd2b62bf..074a2e01ca 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -795,10 +795,11 @@ void MainWindow::captureEventHandler(CaptureEvent * ev)
switch ( ev->eventType() )
{
case CaptureEvent::Started:
- setMenusForCaptureFile(true); captureFileReadStarted(tr("Rescanning"));
+ setMenusForCaptureFile(true);
+ captureFileReadStarted(tr("Rescanning"));
break;
case CaptureEvent::Finished:
- thaw();
+ captureFileReadFinished();
break;
default:
break;