Merge branch 'nyro-fix' into develop

evewspace · Mar 22, 2015 · 2e94fce · 2e94fce
2 parents dc907ac + fc43a7a
commit 2e94fce
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/evewspace/Map/utils.py b/evewspace/Map/utils.py
@@ -254,8 +254,13 @@ def create_syslist(self):
                             parent_column.insert(y_parent, None)
 
         # create list of system dicts from system ids in columns
-        return [self.system_to_dict(obj, xs[i], ys[i]) \
-                for i, obj in systems.items()]
+        syslist = []
+        for x, column in enumerate(columns):
+            for y, sys_id in enumerate(column):
+                if sys_id is not None:
+                    sys_obj = systems[sys_id]
+                    syslist.append(self.system_to_dict(sys_obj, x, y))
+        return syslist
 
 
 def get_wormhole_type(system1, system2):