Fix issues with SoftButtonObject equals method

Author: renonick87

lib/js/src/manager/screen/utils/SoftButtonObject.js

@@ -369,18 +369,36 @@ class SoftButtonObject {
                 if (states[index].getSoftButton().getText() !== otherStates[index].getSoftButton().getText()) {
                     return false;
                 }
-                if (states[index].getSoftButton().getImage() !== otherStates[index].getSoftButton().getImage()) {
+                if ((states[index].getSoftButton().getImage() === null && otherStates[index].getSoftButton().getImage() !== null) ||
+                    (states[index].getSoftButton().getImage() !== null && otherStates[index].getSoftButton().getImage() === null)) {
                     return false;
                 }
+                if (states[index].getSoftButton().getImage() !== null && otherStates[index].getSoftButton().getImage() !== null) {
+                    if (states[index].getSoftButton().getImage().getValueParam() !== otherStates[index].getSoftButton().getImage().getValueParam()) {
+                        return false;
+                    }
+                    if (states[index].getSoftButton().getImage().getImageType() !== otherStates[index].getSoftButton().getImage().getImageType()) {
+                        return false;
+                    }
+                    if (states[index].getSoftButton().getImage().getIsTemplate() !== otherStates[index].getSoftButton().getImage().getIsTemplate()) {
+                        return false;
+                    }
+                }
                 if (states[index].getSoftButton().getSoftButtonID() !== otherStates[index].getSoftButton().getSoftButtonID()) {
                     return false;
                 }
-                // The SdlFile equals() method checks most but not all of the SdlArtwork fields
-                if (states[index].getArtwork().equals(otherStates[index].getArtwork())) {
+                if ((states[index].getArtwork() === null && otherStates[index].getArtwork() !== null) ||
+                    (states[index].getArtwork() !== null && otherStates[index].getArtwork() === null)) {
                     return false;
                 }
-                if (states[index].getArtwork().isTemplateImage() !== otherStates[index].getArtwork().isTemplateImage()) {
-                    return false;
+                if (states[index].getArtwork() !== null && otherStates[index].getArtwork() !== null) {
+                    // The SdlFile equals() method checks most but not all of the SdlArtwork fields
+                    if (!states[index].getArtwork().equals(otherStates[index].getArtwork())) {
+                        return false;
+                    }
+                    if (states[index].getArtwork().isTemplateImage() !== otherStates[index].getArtwork().isTemplateImage()) {
+                        return false;
+                    }
                 }
             }
         }