aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/splash_overlay.cpp
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-01-04 14:10:16 -0800
committerGuy Harris <guy@alum.mit.edu>2017-01-04 22:10:48 +0000
commit26430ff647eff817aebdf7425f866f6d7f0f9860 (patch)
treef6545f703f207fe9f0b84d723823dd3db50143bd /ui/qt/splash_overlay.cpp
parentf7124f64a8bafe70cb52cfeb225265d229befa66 (diff)
Include extcap binaries in the count of things to point out during startup.
The GTK+ version, at least, crashes if there are more "doing XXX..." items put up than the calculated count, so, now that we're putting up items for extcap binaries, we need to count the extcap binaries. Clean up some stuff we found doing this (indentation, a _U_ on something that's used). Change-Id: I1f88042b64ce4b9ae352de37689677c694e3770b Reviewed-on: https://code.wireshark.org/review/19549 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt/splash_overlay.cpp')
-rw-r--r--ui/qt/splash_overlay.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/ui/qt/splash_overlay.cpp b/ui/qt/splash_overlay.cpp
index 36d814d4f0..2b9785c55f 100644
--- a/ui/qt/splash_overlay.cpp
+++ b/ui/qt/splash_overlay.cpp
@@ -33,6 +33,10 @@
#include "epan/wslua/init_wslua.h"
#endif
+#ifdef HAVE_EXTCAP
+#include "../../extcap.h"
+#endif
+
// Uncomment to slow the update progress
//#define THROTTLE_STARTUP 1
@@ -58,7 +62,10 @@ SplashOverlay::SplashOverlay(QWidget *parent) :
// RA_DISSECTORS -> RA_PLUGIN_REGISTER) minus two.
int register_add = 5;
#ifdef HAVE_LUA
- register_add += wslua_count_plugins(); /* get count of lua plugins */
+ register_add += wslua_count_plugins(); /* get count of lua plugins */
+#endif
+#ifdef HAVE_EXTCAP
+ register_add += extcap_count(); /* get count of extcap binaries */
#endif
so_ui_->progressBar->setMaximum((int)register_count() + register_add);
elapsed_timer_.start();