tfl/tc.preset
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug allowing misuse of color_mode 2 and 3 even if preset_metadata not present

Browse Source
This commit is contained in:
TFLCL
2025-10-10 03:02:37 +02:00
parent 4168782fec
commit 9ad871da82
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
javascript/tc.preset.js
View File

@@ -131,7 +131,7 @@ var requested_slot = -1; // Which slot we're waiting a value for (used in get_al
var color_mode_candidate = 0; // Which color mode we're aiming var color_mode_candidate = 0; // Which color mode we're aiming
var is_listening_to_subscriptionlist = 0; //Filters out received subscriptionlist messages when not updating slot color values var is_listening_to_subscriptionlist = 0; //Filters out received subscriptionlist messages when not updating slot color values
var is_listening_to_clientlist = 0; //Filters out received clientlist messages when not updating slot color values var is_listening_to_clientlist = 0; //Filters out received clientlist messages when not updating slot color values
var metadata_pattr; var metadata_pattr = null;
var metadata_pattr_address; var metadata_pattr_address;
var metadata_updated = false; // Flag to write presets file after filling possible empty preset_metadata var metadata_updated = false; // Flag to write presets file after filling possible empty preset_metadata
@@ -687,15 +687,15 @@ function connect_to_metadata_pattr() {
var obj = this.patcher.getnamed("preset_metadata"); var obj = this.patcher.getnamed("preset_metadata");
if (!obj) { if (!obj) {
error("preset_metadata pattr not found.\n"); error("preset_metadata pattr not found.\n");
metadata_pattr = 0; metadata_pattr = null;
return false; return false;
} else if (obj.maxclass != "pattr"){ } else if (obj.maxclass != "pattr"){
error("preset_metadata named object is not a pattr object.\n"); error("preset_metadata named object is not a pattr object.\n");
metadata_pattr = 0; metadata_pattr = null;
return false; return false;
} else if (obj.getattr('invisible') == 1) { } else if (obj.getattr('invisible') == 1) {
error("preset_metadata has been found but has invisible attribute set to 1\n"); error("preset_metadata has been found but has invisible attribute set to 1\n");
metadata_pattr = 0; metadata_pattr = null;
return false; return false;
} else { } else {
metadata_pattr = obj; metadata_pattr = obj;
@@ -2073,13 +2073,16 @@ function setcolor_mode(v){
// For color modes 2 and 3 (select and custom), // For color modes 2 and 3 (select and custom),
// we need to ensure there's a [pattr preset_metadata] somewhere to store the preset color // we need to ensure there's a [pattr preset_metadata] somewhere to store the preset color
if (v >= 2 ) { if (v >= 2 ) {
if (metadata_pattr == undefined) { if (metadata_pattr == null) {
is_listening_to_clientlist = 2; is_listening_to_clientlist = 2;
color_mode_candidate = v; color_mode_candidate = v;
connect_to_metadata_pattr(); connect_to_metadata_pattr();
} else { } else if (metadata_pattr.valid) {
color_mode = v; color_mode = v;
paint_base(); paint_base();
} else {
error("Connection with [pattr preset_metadata lost\n");
metadata_pattr = null;
} }
} else { } else {
color_mode = v; color_mode = v;