partially revert 'better' fix for missing name_label

This commit is contained in:
2025-06-18 08:12:52 +02:00
parent a172bbb6be
commit 1f1b5a2b6e

View File

@ -2432,7 +2432,7 @@ proc -addonGroup {} {
proc webSelectGroup {} { proc webSelectGroup {} {
# group name starting with '-': group is hidden until activated with button # group name starting with '-': group is hidden until activated with button
set u_device [silent [hval /device/name] hval /device/name_label] set u_device [hval /device/name_label]
set u_stick "" set u_stick ""
if {[result device stick_menu] ne ""} { if {[result device stick_menu] ne ""} {
set u_stick [hval /device/stick_label] set u_stick [hval /device/stick_label]
@ -2469,19 +2469,13 @@ proc mainGroup {{forweb ""}} {
Label [string toupper [result instrument]] Label [string toupper [result instrument]]
NoNewline NoNewline
# TODO: remove this intermediate fix on running sea server set u_device [silent [string toupper [hval /device/name]] hval /device/name_label]
if {[silent 0 hval /device/name_label] eq "0"} {
device makeitem name_label [string toupper [hval /device/name]]
device makeitem stick_label [string toupper [hval /device/stick_name]]
}
set u_device [hval /device/name_label]
set lab "Device: $u_device" set lab "Device: $u_device"
SelectButton -device $lab SelectButton -device $lab
NoNewline NoNewline
set u_stick "" set u_stick ""
if {[result device stick_menu] ne ""} { if {[result device stick_menu] ne ""} {
set u_stick [hval /device/stick_label] set u_stick [silent [string toupper [hval /device/stick_name]] hval /device/stick_label]
SelectButton "-sticks" "Stick: $u_stick" SelectButton "-sticks" "Stick: $u_stick"
NoNewline NoNewline
} }