aboutsummaryrefslogtreecommitdiffstats
path: root/tshark.c
diff options
context:
space:
mode:
authorEnrique Giraldo <enrique.giraldo@wslw.es>2021-01-22 09:37:52 +0100
committerGuy Harris <gharris@sonic.net>2021-01-24 02:32:22 +0000
commit506f1c650ff57534b58ee6391b3c537dfc307a0e (patch)
tree0f641ea673f1d0edb29848ba08491eb5b4193324 /tshark.c
parent9ba10532373535debf9b0602982c45bd7eb70cb5 (diff)
tshark: Unconditionally call extcap_register_preferences
extcap_register_preferences is only called with the -G option (to dump information) and extcap preferences are not loading, loading it unconditionally avoids this, as it is done in the GUI startup.
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tshark.c b/tshark.c
index 16897492d6..0b6395533a 100644
--- a/tshark.c
+++ b/tshark.c
@@ -944,6 +944,7 @@ main(int argc, char *argv[])
#ifdef HAVE_PLUGINS
register_all_plugin_tap_listeners();
#endif
+ extcap_register_preferences();
/* Register all tap listeners. */
for (tap_reg_t *t = tap_reg_listener; t->cb_func != NULL; t++) {
t->cb_func();
@@ -971,7 +972,6 @@ main(int argc, char *argv[])
if (strcmp(argv[2], "column-formats") == 0)
column_dump_column_formats();
else if (strcmp(argv[2], "currentprefs") == 0) {
- extcap_register_preferences();
epan_load_settings();
write_prefs(NULL);
}