Merge pull request tv2#223 from nrkno/fix/default-label-fallback

Fix/default label fallback
nrkno · Feb 14, 2022 · c3b9761 · c3b9761
2 parents 21e7e24 + f854be0
commit c3b9761
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/client/utils/labels.ts b/client/utils/labels.ts
@@ -30,18 +30,19 @@ export function getFaderLabel(faderIndex: number, defaultName = 'CH'): string {
     const channelLabel = getChannelLabel(state, faderIndex)
 
     switch (state.settings[0].labelType) {
+        case 'automation':
+            return automationLabel || defaultName + ' ' + (faderIndex + 1)
+        case 'user':
+            return userLabel || defaultName + ' ' + (faderIndex + 1)
+        case 'channel':
+            return channelLabel || defaultName + ' ' + (faderIndex + 1)
         case 'automatic':
+        default:
             return (
                 userLabel ||
                 automationLabel ||
                 channelLabel ||
                 defaultName + ' ' + (faderIndex + 1)
             )
-        case 'automation':
-            return automationLabel || defaultName + ' ' + (faderIndex + 1)
-        case 'user':
-            return userLabel || defaultName + ' ' + (faderIndex + 1)
-        case 'channel':
-            return channelLabel || defaultName + ' ' + (faderIndex + 1)
     }
 }
diff --git a/server/utils/labels.ts b/server/utils/labels.ts
@@ -31,18 +31,19 @@ export function getFaderLabel(faderIndex: number, defaultName = 'CH'): string {
     const channelLabel = getChannelLabel(state, faderIndex)
 
     switch (state.settings[0].labelType) {
+        case 'automation':
+            return automationLabel || defaultName + ' ' + (faderIndex + 1)
+        case 'user':
+            return userLabel || defaultName + ' ' + (faderIndex + 1)
+        case 'channel':
+            return channelLabel || defaultName + ' ' + (faderIndex + 1)
         case 'automatic':
+        default:
             return (
                 userLabel ||
                 automationLabel ||
                 channelLabel ||
                 defaultName + ' ' + (faderIndex + 1)
             )
-        case 'automation':
-            return automationLabel || defaultName + ' ' + (faderIndex + 1)
-        case 'user':
-            return userLabel || defaultName + ' ' + (faderIndex + 1)
-        case 'channel':
-            return channelLabel || defaultName + ' ' + (faderIndex + 1)
     }
 }