add check to 0190-WebUI-Fix-AddMissingExtendedChannelDescriptions Web…

…UI patch if chn exists (#2912, @jp112sdl)
jens-maus · Nov 12, 2024 · 5b2887c · 5b2887c
1 parent 6e7ad3f
commit 5b2887c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/buildroot-external/patches/occu/0190-WebUI-Fix-AddMissingExtendedChannelDescriptions.patch b/buildroot-external/patches/occu/0190-WebUI-Fix-AddMissingExtendedChannelDescriptions.patch
@@ -20,3 +20,21 @@
 
    if (chType == "KEY_TRANSCEIVER") {
      if (deviceType.toLowerCase().indexOf("hmip-asir") != -1) {
+@@ -35609,13 +35609,15 @@
+         typeExt = "_" + multiMode;
+       } else {
+         if (channelAddress != "undefined") {
+-          var chn = DeviceList.getChannelByAddress(channelAddress),
+-          chnMode = parseInt(chn.multiMode);
++          var chn = DeviceList.getChannelByAddress(channelAddress);
++          if (typeof chn != "undefined") {
++          var chnMode = parseInt(chn.multiMode);
+           if (! isNaN(chnMode)) {
+             typeExt = "_" + chnMode;
+           } else {
+             typeExt = "";
+           }
++          }
+         } else {
+           typeExt = "_1";
+         }
diff --git a/...s/occu/0190-WebUI-Fix-AddMissingExtendedChannelDescriptions/occu/WebUI/www/webui/webui.js b/...s/occu/0190-WebUI-Fix-AddMissingExtendedChannelDescriptions/occu/WebUI/www/webui/webui.js
@@ -35609,13 +35609,15 @@ getExtendedDescription = function(oChannelDescr) {
         typeExt = "_" + multiMode;
       } else {
         if (channelAddress != "undefined") {
-          var chn = DeviceList.getChannelByAddress(channelAddress),
-          chnMode = parseInt(chn.multiMode);
+          var chn = DeviceList.getChannelByAddress(channelAddress);
+          if (typeof chn != "undefined") {
+          var chnMode = parseInt(chn.multiMode);
           if (! isNaN(chnMode)) {
             typeExt = "_" + chnMode;
           } else {
             typeExt = "";
           }
+          }
         } else {
           typeExt = "_1";
         }