aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/extcap_options_dialog.cpp
diff options
context:
space:
mode:
authorRoland Knall <roland.knall@br-automation.com>2018-05-09 09:55:32 +0200
committerRoland Knall <rknall@gmail.com>2018-05-09 10:01:57 +0000
commita5e3414fc62505c6b510b8e9d2c6cced285f2807 (patch)
treef55300d08afe988c8f91de2e1f63e884003ce5e1 /ui/qt/extcap_options_dialog.cpp
parentbba0041bfdea0c64acbf1945e215737a394de4e8 (diff)
extcap: Fix required indicator
Fix required indicator on reset and change an assert to a simple drop-out Change-Id: I355980223f213fef8ee4c6ac7d6bcb0fce1a7913 Reviewed-on: https://code.wireshark.org/review/27416 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui/qt/extcap_options_dialog.cpp')
-rw-r--r--ui/qt/extcap_options_dialog.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/ui/qt/extcap_options_dialog.cpp b/ui/qt/extcap_options_dialog.cpp
index 3c69f99ea6..9a2e602b62 100644
--- a/ui/qt/extcap_options_dialog.cpp
+++ b/ui/qt/extcap_options_dialog.cpp
@@ -315,7 +315,12 @@ void ExtcapOptionsDialog::updateWidgets()
if ( argument->group().length() > 0 )
groupKey = argument->group();
- Q_ASSERT(layouts.keys().contains(groupKey));
+ /* Skip non-assigned group keys, this happens if the configuration of the extcap is faulty */
+ if ( ! layouts.keys().contains(groupKey) )
+ {
+ ++iter;
+ continue;
+ }
QGridLayout * layout = ((QGridLayout *)layouts[groupKey]->layout());
lblWidget = argument->createLabel((QWidget *)this);
@@ -531,7 +536,10 @@ void ExtcapOptionsDialog::resetValues()
/* this stores all values to the preferences */
if ( doStore )
+ {
storeValues();
+ anyValueChanged();
+ }
}
}