From d854d6b88cdce93acb9046402fa69c6dfb7ce8f1 Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Tue, 26 Apr 2022 19:14:27 +0200
Subject: [PATCH] bugfix: ng-> 3surf color map not loading

---
 .../nehuba/layerCtrl.service/layerCtrl.effects.ts            | 5 ++++-
 .../threeSurfer/threeSurferGlue/threeSurfer.component.ts     | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.effects.ts b/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.effects.ts
index 674f4ace3..314049276 100644
--- a/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.effects.ts
+++ b/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.effects.ts
@@ -122,7 +122,10 @@ export class LayerCtrlEffects {
       this.store.pipe(
         select(atlasAppearance.selectors.customLayers),
         map(
-          cl => cl.filter(layer => layer.clType === "baselayer/nglayer" || "customlayer/nglayer")
+          cl => cl.filter(layer =>
+            layer.clType === "baselayer/nglayer"
+            || layer.clType === "customlayer/nglayer"
+          )
         )
       )
     ),
diff --git a/src/viewerModule/threeSurfer/threeSurferGlue/threeSurfer.component.ts b/src/viewerModule/threeSurfer/threeSurferGlue/threeSurfer.component.ts
index df0dcd3f9..a194176aa 100644
--- a/src/viewerModule/threeSurfer/threeSurferGlue/threeSurfer.component.ts
+++ b/src/viewerModule/threeSurfer/threeSurferGlue/threeSurfer.component.ts
@@ -431,6 +431,8 @@ export class ThreeSurferGlueCmp implements IViewer<'threeSurfer'>, AfterViewInit
      * 3/ select region, hide hemisphere, deselect region
      */
     if (!this.colormapInUse) return
+    if (!this.tsRef) return
+    
     const isBaseCM = this.colormapInUse?.clType === "baselayer/colormap"
 
     for (const laterality in this.lateralityMeshRecord) {
-- 
GitLab