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();
+        }
     }
 }