fixed possible NPE introduced with last bugfix

asterics · Apr 8, 2024 · 0a5f8a2 · 0a5f8a2
1 parent cd41c67
commit 0a5f8a2
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/js/grid.js b/src/js/grid.js
@@ -75,11 +75,8 @@ function Grid(gridContainerId, gridItemClass, options) {
             //only add global grid if not in edit mode
             promises.push(
                 dataService.getGlobalGrid().then((globalGrid) => {
-                    if (globalGrid.gridElements.length === 0) {
-                        return Promise.resolve();
-                    }
                     stateService.setGlobalGrid(globalGrid);
-                    if (globalGrid) {
+                    if (globalGrid && globalGrid.gridElements && globalGrid.gridElements.length > 0) {
                         let autowidth = true;
                         let heightPercentage = options.globalGridHeightPercentage
                             ? options.globalGridHeightPercentage / 100