Cleanup|libappfw|GridLayout: Added an assertion

skyjake · May 16, 2015 · 3c13652 · 3c13652
1 parent f59e172
commit 3c13652
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/doomsday/sdk/libappfw/src/gridlayout.cpp b/doomsday/sdk/libappfw/src/gridlayout.cpp
@@ -211,25 +211,22 @@ DENG2_PIMPL(GridLayout)
             addMetric(list);
         }
         DENG2_ASSERT(index < list.size());
-
-
-        if (list[index]) {
-
-            Metric &metric = *list[index];
-
-            if(!metric.fixedLength)
-            {
-                changeRef(metric.current, OperatorRule::maximum(rule, metric.current));
 
-                // Update the indirection.
-                metric.final->setSource(*metric.current);
-            }
-            else
-            {
-                // Fixed lengths are never affected.
-                metric.final->setSource(*metric.fixedLength);
-            }
+        DENG2_ASSERT(list[index] != nullptr);
+        if(!list[index]) return;
+
+        Metric &metric = *list[index];
+        if(!metric.fixedLength)
+        {
+            changeRef(metric.current, OperatorRule::maximum(rule, metric.current));
 
+            // Update the indirection.
+            metric.final->setSource(*metric.current);
+        }
+        else
+        {
+            // Fixed lengths are never affected.
+            metric.final->setSource(*metric.fixedLength);
         }
     }