Qt: rework routine in module_preferences_scroll_area.

This removes a check that confuses clang and generates a false poritive.

Change-Id: Ib28b88b40e16ad300ba6d3df8334bd752a4fa7f1
Reviewed-on: https://code.wireshark.org/review/26171
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/ui/qt/module_preferences_scroll_area.cpp b/ui/qt/module_preferences_scroll_area.cpp
index 2cb5330080..52e66852f0 100644
--- a/ui/qt/module_preferences_scroll_area.cpp
+++ b/ui/qt/module_preferences_scroll_area.cpp
@@ -87,14 +87,16 @@ pref_show(pref_t *pref, gpointer layout_ptr)
     case PREF_ENUM:
     {
         const enum_val_t *ev;
-        if (prefs_get_enumvals(pref) == NULL) return 0;
+        ev = prefs_get_enumvals(pref);
+        if (!ev || !ev->description)
+            return 0;
 
         if (prefs_get_enum_radiobuttons(pref)) {
             QLabel *label = new QLabel(prefs_get_title(pref));
             label->setToolTip(tooltip);
             vb->addWidget(label);
             QButtonGroup *enum_bg = new QButtonGroup(vb);
-            for (ev = prefs_get_enumvals(pref); ev && ev->description; ev++) {
+            while (ev->description) {
                 QRadioButton *enum_rb = new QRadioButton(title_to_shortcut(ev->description));
                 enum_rb->setToolTip(tooltip);
                 QStyleOption style_opt;
@@ -107,6 +109,7 @@ pref_show(pref_t *pref, gpointer layout_ptr)
                                   .arg(enum_rb->style()->subElementRect(QStyle::SE_CheckBoxContents, &style_opt).left()));
                 enum_bg->addButton(enum_rb, ev->value);
                 vb->addWidget(enum_rb);
+                ev++;
             }
         } else {
             QHBoxLayout *hb = new QHBoxLayout();