Restyle fix

pidarped · pidarped · commit a7efa6345d48 · 2025-11-05T20:40:40.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
@@ -1005,14 +1005,14 @@ void CameraAVStreamMgmtServer::ModifyVideoStream(const uint16_t streamID, const
             if (waterMarkEnabled.HasValue())
             {
                 wasModified = !stream.watermarkEnabled.HasValue() ||
-                    (stream.watermarkEnabled.HasValue() &&
-                     stream.watermarkEnabled.Value() != waterMarkEnabled.Value());
+                    (stream.watermarkEnabled.HasValue() && stream.watermarkEnabled.Value() != waterMarkEnabled.Value());
                 stream.watermarkEnabled = waterMarkEnabled;
             }
             if (osdEnabled.HasValue())
             {
-                wasModified = wasModified || (!stream.OSDEnabled.HasValue() ||
-                    (stream.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)
@@ -1036,14 +1036,14 @@ void CameraAVStreamMgmtServer::ModifySnapshotStream(const uint16_t streamID, con
             if (waterMarkEnabled.HasValue())
             {
                 wasModified = !stream.watermarkEnabled.HasValue() ||
-                    (stream.watermarkEnabled.HasValue() &&
-                     stream.watermarkEnabled.Value() != waterMarkEnabled.Value());
+                    (stream.watermarkEnabled.HasValue() && stream.watermarkEnabled.Value() != waterMarkEnabled.Value());
                 stream.watermarkEnabled = waterMarkEnabled;
             }
             if (osdEnabled.HasValue())
             {
-                wasModified = wasModified || (!stream.OSDEnabled.HasValue() ||
-                    (stream.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
`@@ -1005,14 +1005,14 @@ void CameraAVStreamMgmtServer::ModifyVideoStream(const uint16_t streamID, const`
`1005`	`1005`	`if (waterMarkEnabled.HasValue())`
`1006`	`1006`	`{`
`1007`	`1007`	`wasModified = !stream.watermarkEnabled.HasValue() \|\|`
`1008`		`- (stream.watermarkEnabled.HasValue() &&`
`1009`		`- stream.watermarkEnabled.Value() != waterMarkEnabled.Value());`
	`1008`	`+ (stream.watermarkEnabled.HasValue() && stream.watermarkEnabled.Value() != waterMarkEnabled.Value());`
`1010`	`1009`	`stream.watermarkEnabled = waterMarkEnabled;`
`1011`	`1010`	`}`
`1012`	`1011`	`if (osdEnabled.HasValue())`
`1013`	`1012`	`{`
`1014`		`- wasModified = wasModified \|\| (!stream.OSDEnabled.HasValue() \|\|`
`1015`		`- (stream.OSDEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value()));`
	`1013`	`+ wasModified = wasModified \|\|`
	`1014`	`+ (!stream.OSDEnabled.HasValue() \|\|`
	`1015`	`+ (stream.OSDEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value()));`
`1016`	`1016`	`stream.OSDEnabled = osdEnabled;`
`1017`	`1017`	`}`
`1018`	`1018`	`if (wasModified)`
`@@ -1036,14 +1036,14 @@ void CameraAVStreamMgmtServer::ModifySnapshotStream(const uint16_t streamID, con`
`1036`	`1036`	`if (waterMarkEnabled.HasValue())`
`1037`	`1037`	`{`
`1038`	`1038`	`wasModified = !stream.watermarkEnabled.HasValue() \|\|`
`1039`		`- (stream.watermarkEnabled.HasValue() &&`
`1040`		`- stream.watermarkEnabled.Value() != waterMarkEnabled.Value());`
	`1039`	`+ (stream.watermarkEnabled.HasValue() && stream.watermarkEnabled.Value() != waterMarkEnabled.Value());`
`1041`	`1040`	`stream.watermarkEnabled = waterMarkEnabled;`
`1042`	`1041`	`}`
`1043`	`1042`	`if (osdEnabled.HasValue())`
`1044`	`1043`	`{`
`1045`		`- wasModified = wasModified \|\| (!stream.OSDEnabled.HasValue() \|\|`
`1046`		`- (stream.OSDEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value()));`
	`1044`	`+ wasModified = wasModified \|\|`
	`1045`	`+ (!stream.OSDEnabled.HasValue() \|\|`
	`1046`	`+ (stream.OSDEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value()));`
`1047`	`1047`	`stream.OSDEnabled = osdEnabled;`
`1048`	`1048`	`}`
`1049`	`1049`	`if (wasModified)`