Merge pull request #467 from smartdevicelink/bugfix/scm-get-templates-crash

crokita · web-flow · commit a184f8ffe8f8 · 2021-06-21T10:14:55.000-04:00
Do a null check for the templates available in the window capability
diff --git a/lib/js/src/manager/SystemCapabilityManager.js b/lib/js/src/manager/SystemCapabilityManager.js
@@ -734,7 +734,7 @@ class SystemCapabilityManager extends _SubManagerBase {
         }
 
         // Ford Sync bug returning incorrect template name for "NON-MEDIA" https://github.com/smartdevicelink/sdl_javascript_suite/issues/450
-        const templatesAvailable = defaultMainWindow.getTemplatesAvailable();
+        const templatesAvailable = defaultMainWindow.getTemplatesAvailable() !== null ? defaultMainWindow.getTemplatesAvailable() : [];
         for (let index = 0; index < templatesAvailable.length; index++) {
             if (templatesAvailable[index] === 'NON_MEDIA') {
                 templatesAvailable[index] = 'NON-MEDIA';

Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,7 @@ class SystemCapabilityManager extends _SubManagerBase {`
`734`	`734`	`}`
`735`	`735`
`736`	`736`	`// Ford Sync bug returning incorrect template name for "NON-MEDIA" https://github.com/smartdevicelink/sdl_javascript_suite/issues/450`
`737`		`- const templatesAvailable = defaultMainWindow.getTemplatesAvailable();`
	`737`	`+ const templatesAvailable = defaultMainWindow.getTemplatesAvailable() !== null ? defaultMainWindow.getTemplatesAvailable() : [];`
`738`	`738`	`for (let index = 0; index < templatesAvailable.length; index++) {`
`739`	`739`	`if (templatesAvailable[index] === 'NON_MEDIA') {`
`740`	`740`	`templatesAvailable[index] = 'NON-MEDIA';`