Merge branch 'master' into merge-master

2022-04-04 20:52:42 +02:00
parent 969acbd47f e362b3b6aa
commit 081f211231
32 changed files with 2111 additions and 416 deletions
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -1901,7 +1901,11 @@ function setSegBri(s)
 function tglFreeze(s=null)
 {
 	var obj = {"seg": {"frz": "t"}}; // toggle
-	if (s!==null) obj.seg.id = s;
+	if (s!==null) {
+		obj.seg.id = s;
+		// if live segment, enter live override (which also unfreezes)
+		if (lastinfo && s==lastinfo.liveseg && lastinfo.live) obj = {"lor":1};
+	}
 	requestJson(obj);
 }