From 94a0e98f32e8c46c87537df2535d2cdb033f68b6 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Sun, 3 Jan 2016 20:17:39 -0800
Subject: [PATCH] Fix default comp id detection

---
 src/FactSystem/ParameterLoader.cc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/FactSystem/ParameterLoader.cc b/src/FactSystem/ParameterLoader.cc
index e9be6b724..3025b7039 100644
--- a/src/FactSystem/ParameterLoader.cc
+++ b/src/FactSystem/ParameterLoader.cc
@@ -335,12 +335,18 @@ void ParameterLoader::_determineDefaultComponentId(void)
         // the set of parameters. Better than nothing!
 
         _defaultComponentId = -1;
+        int largestCompParamCount = 0;
         foreach(int componentId, _mapParameterName2Variant.keys()) {
-            if (_mapParameterName2Variant[componentId].count() > _defaultComponentId) {
+            int compParamCount = _mapParameterName2Variant[componentId].count();
+            if (compParamCount > largestCompParamCount) {
+                largestCompParamCount = compParamCount;
                 _defaultComponentId = componentId;
             }
         }
-        Q_ASSERT(_defaultComponentId != -1);
+
+        if (_defaultComponentId == -1) {
+            qWarning() << "All parameters missing, unable to determine default componet id";
+        }
     }
 }
 
-- 
2.22.0