aboutsummaryrefslogtreecommitdiffstats
path: root/wireshark-qt.cpp
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2015-12-10 14:03:27 +0100
committerStig Bjørlykke <stig@bjorlykke.org>2015-12-10 14:08:58 +0000
commitbfcd1e65141c7929e447132fcb26f4044276ec20 (patch)
treeebad6261b7155f93e84ac0ccd4e4c8541e86b5cd /wireshark-qt.cpp
parent5062fe0a88a246cc1202fa991e3f37a7733a8371 (diff)
Qt: Reset preferences when reloading Lua plugins
Reading configuration files may duplicate some entries, so ensure we reset preferences before reloading. Change-Id: I746414cbc10c206ddf47669856f329b9e0202a0d Reviewed-on: https://code.wireshark.org/review/12496 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'wireshark-qt.cpp')
-rw-r--r--wireshark-qt.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index 79f4bc9613..4033b5d201 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -867,7 +867,7 @@ DIAG_ON(cast-qual)
splash_update(RA_PREFERENCES, NULL, NULL);
- prefs_p = ws_app.readConfigurationFiles(&gdp_path, &dp_path);
+ prefs_p = ws_app.readConfigurationFiles(&gdp_path, &dp_path, false);
/*
* To reset the options parser, set optreset to 1 on platforms that