From f2f1e355c23f2b7b2388549ba420bf357a08a752 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Wed, 30 Oct 2019 16:30:08 -0700
Subject: [PATCH] molql, fix expandConnected

---
 src/mol-model/structure/query/queries/modifiers.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mol-model/structure/query/queries/modifiers.ts b/src/mol-model/structure/query/queries/modifiers.ts
index 93c4ba821..770d64bd8 100644
--- a/src/mol-model/structure/query/queries/modifiers.ts
+++ b/src/mol-model/structure/query/queries/modifiers.ts
@@ -341,7 +341,6 @@ function expandConnected(ctx: QueryContext, structure: Structure, linkTest: Quer
 
     // Process intra unit links
     for (const unit of structure.units) {
-        processedUnits.add(unit.id);
 
         if (unit.kind !== Unit.Kind.Atomic) {
             // add the whole unit
@@ -379,7 +378,7 @@ function expandConnected(ctx: QueryContext, structure: Structure, linkTest: Quer
 
         // Process inter unit links
         for (const linkedUnit of interLinks.getLinkedUnits(inputUnit)) {
-            if (processedUnits.has(linkedUnit.unitB.id)) continue;
+            if (processedUnits.has(linkedUnit.unitA.id)) continue;
 
             atomicLink.link.bUnit = linkedUnit.unitB;
             for (const aI of linkedUnit.linkedElementIndices) {
@@ -397,6 +396,8 @@ function expandConnected(ctx: QueryContext, structure: Structure, linkTest: Quer
                 }
             }
         }
+
+        processedUnits.add(unit.id);
     }
 
     return builder.getStructure();
-- 
GitLab