Fix possible failure to derive certain features

a1rwulf · Oct 19, 2016 · 39751ff · 39751ff
1 parent 0da70a1
commit 39751ff
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/buttonmapper/ButtonMapper.cpp b/src/buttonmapper/ButtonMapper.cpp
@@ -113,6 +113,9 @@ void CButtonMapper::MergeFeatures(FeatureVector& features, const FeatureVector&
         {
           for (const auto& primitive : feature.Primitives())
           {
+            if (primitive.Type() == JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN)
+              continue;
+
             if (std::find(newPrimitives.begin(), newPrimitives.end(), primitive) != newPrimitives.end())
               return true; // Found primitive
           }