From 02c732aa157d43a8146f7781cca67efc1254812c Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.sweed@gmail.com>
Date: Mon, 29 Jul 2019 14:28:46 +0200
Subject: [PATCH] fix(config): Stop crashes if window.config is not defined
 when script-tag viewer is loaded

---
 cypress/support/script-tag/index.html | 6 +-----
 src/App.js                            | 2 +-
 src/OHIFStandaloneViewer.js           | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/cypress/support/script-tag/index.html b/cypress/support/script-tag/index.html
index b99156468..c647ff594 100644
--- a/cypress/support/script-tag/index.html
+++ b/cypress/support/script-tag/index.html
@@ -25,12 +25,11 @@
 
   <div id="root"></div>
 
+  <script src="/dist/index.umd.js" crossorigin></script>
   <script>
     window.config = {
       // default: '/'
       routerBasename: '/',
-      // default: ''
-      relativeWebWorkerScriptsPath: '',
       servers: {
         dicomWeb: [
           {
@@ -45,10 +44,7 @@
         ],
       },
     }
-  </script>
 
-  <script src="/dist/index.umd.js" crossorigin></script>
-  <script>
     window.OHIFStandaloneViewer.installViewer(window.config);
   </script>
 </body>
diff --git a/src/App.js b/src/App.js
index fe51866cc..743af05bc 100644
--- a/src/App.js
+++ b/src/App.js
@@ -72,7 +72,7 @@ extensionManager.registerExtensions([
 ]);
 
 // Must run after extension commands are registered
-if (window.config.hotkeys) {
+if (window.config && window.config.hotkeys) {
   hotkeysManager.setHotkeys(window.config.hotkeys, true);
 }
 
diff --git a/src/OHIFStandaloneViewer.js b/src/OHIFStandaloneViewer.js
index ccd74a16b..7c17347f2 100644
--- a/src/OHIFStandaloneViewer.js
+++ b/src/OHIFStandaloneViewer.js
@@ -136,7 +136,7 @@ class OHIFStandaloneViewer extends Component {
     ];
 
     const showStudyList =
-      window.config.showStudyList !== undefined
+      window.config && window.config.showStudyList !== undefined
         ? window.config.showStudyList
         : true;
     if (showStudyList) {