From 91d2d3184676c13911897797ba1734cd543243d0 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.sweed@gmail.com>
Date: Tue, 9 Jul 2019 18:17:13 +0200
Subject: [PATCH] @ohif/extension-cornerstone: Prevent errors when display set
 is empty object (0.0.40) (#637)

---
 extensions/ohif-cornerstone-extension/package.json            | 2 +-
 .../ohif-cornerstone-extension/src/OHIFCornerstoneViewport.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/extensions/ohif-cornerstone-extension/package.json b/extensions/ohif-cornerstone-extension/package.json
index 3043f2a11..a2306c41e 100644
--- a/extensions/ohif-cornerstone-extension/package.json
+++ b/extensions/ohif-cornerstone-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "0.0.39",
+  "version": "0.0.40",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
diff --git a/extensions/ohif-cornerstone-extension/src/OHIFCornerstoneViewport.js b/extensions/ohif-cornerstone-extension/src/OHIFCornerstoneViewport.js
index 3a75bfa0e..a9e6fdae6 100644
--- a/extensions/ohif-cornerstone-extension/src/OHIFCornerstoneViewport.js
+++ b/extensions/ohif-cornerstone-extension/src/OHIFCornerstoneViewport.js
@@ -202,6 +202,10 @@ class OHIFCornerstoneViewport extends Component {
       frameIndex,
     } = displaySet;
 
+    if (!studyInstanceUid || !displaySetInstanceUid) {
+      return;
+    }
+
     if (sopClassUids && sopClassUids.length > 1) {
       console.warn(
         'More than one SOPClassUid in the same series is not yet supported.'