Fix wasModified logic check for optional OSD and WMark.

pidarped · pidarped · commit 6b436b753290 · 2025-11-05T20:33:34.000-08:00
diff --git a/src/app/clusters/camera-av-stream-management-server/camera-av-stream-management-server.cpp b/src/app/clusters/camera-av-stream-management-server/camera-av-stream-management-server.cpp
@@ -1004,15 +1004,15 @@ void CameraAVStreamMgmtServer::ModifyVideoStream(const uint16_t streamID, const
             bool wasModified = false;
             if (waterMarkEnabled.HasValue())
             {
-                wasModified = (stream.watermarkEnabled.HasValue() != waterMarkEnabled.HasValue()) ||
-                    (stream.watermarkEnabled.HasValue() && waterMarkEnabled.HasValue() &&
+                wasModified = !stream.watermarkEnabled.HasValue() ||
+                    (stream.watermarkEnabled.HasValue() &&
                      stream.watermarkEnabled.Value() != waterMarkEnabled.Value());
                 stream.watermarkEnabled = waterMarkEnabled;
             }
             if (osdEnabled.HasValue())
             {
-                wasModified = wasModified || (stream.OSDEnabled.HasValue() != osdEnabled.HasValue()) ||
-                    (stream.OSDEnabled.HasValue() && osdEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value());
+                wasModified = wasModified || (!stream.OSDEnabled.HasValue() ||
+                    (stream.OSDEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value()));
                 stream.OSDEnabled = osdEnabled;
             }
             if (wasModified)
@@ -1035,15 +1035,15 @@ void CameraAVStreamMgmtServer::ModifySnapshotStream(const uint16_t streamID, con
             bool wasModified = false;
             if (waterMarkEnabled.HasValue())
             {
-                wasModified = (stream.watermarkEnabled.HasValue() != waterMarkEnabled.HasValue()) ||
-                    (stream.watermarkEnabled.HasValue() && waterMarkEnabled.HasValue() &&
+                wasModified = !stream.watermarkEnabled.HasValue() ||
+                    (stream.watermarkEnabled.HasValue() &&
                      stream.watermarkEnabled.Value() != waterMarkEnabled.Value());
                 stream.watermarkEnabled = waterMarkEnabled;
             }
             if (osdEnabled.HasValue())
             {
-                wasModified = wasModified || (stream.OSDEnabled.HasValue() != osdEnabled.HasValue()) ||
-                    (stream.OSDEnabled.HasValue() && osdEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value());
+                wasModified = wasModified || (!stream.OSDEnabled.HasValue() ||
+                    (stream.OSDEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value()));
                 stream.OSDEnabled = osdEnabled;
             }
             if (wasModified)

Original file line number	Diff line number	Diff line change
`@@ -1004,15 +1004,15 @@ void CameraAVStreamMgmtServer::ModifyVideoStream(const uint16_t streamID, const`
`1004`	`1004`	`bool wasModified = false;`
`1005`	`1005`	`if (waterMarkEnabled.HasValue())`
`1006`	`1006`	`{`
`1007`		`- wasModified = (stream.watermarkEnabled.HasValue() != waterMarkEnabled.HasValue()) \|\|`
`1008`		`- (stream.watermarkEnabled.HasValue() && waterMarkEnabled.HasValue() &&`
	`1007`	`+ wasModified = !stream.watermarkEnabled.HasValue() \|\|`
	`1008`	`+ (stream.watermarkEnabled.HasValue() &&`
`1009`	`1009`	`stream.watermarkEnabled.Value() != waterMarkEnabled.Value());`
`1010`	`1010`	`stream.watermarkEnabled = waterMarkEnabled;`
`1011`	`1011`	`}`
`1012`	`1012`	`if (osdEnabled.HasValue())`
`1013`	`1013`	`{`
`1014`		`- wasModified = wasModified \|\| (stream.OSDEnabled.HasValue() != osdEnabled.HasValue()) \|\|`
`1015`		`- (stream.OSDEnabled.HasValue() && osdEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value());`
	`1014`	`+ wasModified = wasModified \|\| (!stream.OSDEnabled.HasValue() \|\|`
	`1015`	`+ (stream.OSDEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value()));`
`1016`	`1016`	`stream.OSDEnabled = osdEnabled;`
`1017`	`1017`	`}`
`1018`	`1018`	`if (wasModified)`
`@@ -1035,15 +1035,15 @@ void CameraAVStreamMgmtServer::ModifySnapshotStream(const uint16_t streamID, con`
`1035`	`1035`	`bool wasModified = false;`
`1036`	`1036`	`if (waterMarkEnabled.HasValue())`
`1037`	`1037`	`{`
`1038`		`- wasModified = (stream.watermarkEnabled.HasValue() != waterMarkEnabled.HasValue()) \|\|`
`1039`		`- (stream.watermarkEnabled.HasValue() && waterMarkEnabled.HasValue() &&`
	`1038`	`+ wasModified = !stream.watermarkEnabled.HasValue() \|\|`
	`1039`	`+ (stream.watermarkEnabled.HasValue() &&`
`1040`	`1040`	`stream.watermarkEnabled.Value() != waterMarkEnabled.Value());`
`1041`	`1041`	`stream.watermarkEnabled = waterMarkEnabled;`
`1042`	`1042`	`}`
`1043`	`1043`	`if (osdEnabled.HasValue())`
`1044`	`1044`	`{`
`1045`		`- wasModified = wasModified \|\| (stream.OSDEnabled.HasValue() != osdEnabled.HasValue()) \|\|`
`1046`		`- (stream.OSDEnabled.HasValue() && osdEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value());`
	`1045`	`+ wasModified = wasModified \|\| (!stream.OSDEnabled.HasValue() \|\|`
	`1046`	`+ (stream.OSDEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value()));`
`1047`	`1047`	`stream.OSDEnabled = osdEnabled;`
`1048`	`1048`	`}`
`1049`	`1049`	`if (wasModified)`