api/focus: Fix the layer name parsing, again

The previous change made Chrysalis not error out when there were no layer names present, but it also broke the name parsing when there were. With this change, we handle both cases appropriately. Signed-off-by: Gergely Nagy <[email protected]>
keyboardio · Jul 23, 2022 · 6295a2e · 6295a2e
1 parent d45e9c4
commit 6295a2e
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/api/focus/layernames.js b/src/api/focus/layernames.js
@@ -29,15 +29,11 @@ export default class LayerNames {
     const data = await s.request("keymap.layerNames");
     if (!data) return { storageSize: 0, names: [] };
 
-    const storageSize = data
-      .split(/\n/)
-      .map((x) => x.split(/^(\d+) /).slice(1))
-      .pop()[1]
-      .split(/=/)
-      .pop();
+    const names = data.split(/\n/).map((x) => x.split(/^(\d+) /).slice(1));
+    const storageSize = names.pop()[1].split(/=/).pop();
     return {
       storageSize: parseInt(storageSize),
-      names: data.map((x) => x[1]),
+      names: names.map((x) => x[1]),
     };
   }