Merge pull request #494 from okmiim/viewer-exception

BUG: Fix uninitialized variable in viewer
InsightSoftwareConsortium · Aug 9, 2022 · 9c810f6 · 9c810f6
2 parents 57701a7 + cf50853
commit 9c810f6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/js/lib/viewer.js b/js/lib/viewer.js
@@ -232,7 +232,7 @@ const createRenderingPipeline = (
     backgroundColor[2] = rgb[2] / 255.0
   }
   const backgroundTrait = domWidgetView.model.get('background')
-  if (backgroundTrait.length !== 0) {
+  if (backgroundTrait && !!backgroundTrait.length) {
     backgroundColor = backgroundTrait
   }
   const viewerStyle = {
@@ -721,7 +721,7 @@ const ViewerView = widgets.DOMWidgetView.extend({
     }
     this.model.itkVtkViewer.on('backgroundColorChanged', onBackgroundChanged)
     const background = this.model.get('background')
-    if (background.length === 0) {
+    if (background === null|| background.length === 0) {
       this.model.set('background', this.model.itkVtkViewer.getBackgroundColor())
     }
 
@@ -930,7 +930,7 @@ const ViewerView = widgets.DOMWidgetView.extend({
       onChannelsChanged
     )
     const channels = this.model.get('channels')
-    if (channels.length === 0) {
+    if (channels === null || channels.length === 0) {
       this.model.set('channels', this.model.itkVtkViewer.getComponentVisibilities())
     }