From 26430ff647eff817aebdf7425f866f6d7f0f9860 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 4 Jan 2017 14:10:16 -0800 Subject: 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 --- ui/qt/splash_overlay.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'ui/qt/splash_overlay.cpp') 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(); -- cgit v1.2.3