Fixed: Crash attempting to play maps containing a single subsector

skyjake · Jun 27, 2012 · fbfa49f · fbfa49f
1 parent 151f3be
commit fbfa49f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/doomsday/engine/portable/src/edit_bsp.cpp b/doomsday/engine/portable/src/edit_bsp.cpp
@@ -219,7 +219,9 @@ static void hardenBSP(BspBuilder& builder, GameMap* dest)
     dest->bspLeafs = static_cast<BspLeaf**>(Z_Calloc(dest->numBspLeafs * sizeof(BspLeaf*), PU_MAPSTATIC, 0));
 
     BspTreeNode* rootNode = builder.root();
-    if(rootNode && rootNode->isLeaf())
+    dest->bsp = rootNode->userData();
+
+    if(rootNode->isLeaf())
     {
         // Take ownership of this leaf.
         Q_ASSERT(rootNode->userData());
@@ -229,11 +231,10 @@ static void hardenBSP(BspBuilder& builder, GameMap* dest)
         // Add this BspLeaf to the LUT.
         leaf->index = 0;
         dest->bspLeafs[0] = leaf;
+
         return;
     }
 
-    dest->bsp = rootNode->userData();
-
     populatebspobjectluts_params_t p;
     p.builder = &builder;
     p.dest = dest;