From b3df8718b5bf10cb1f437a60712e4b339c6cbc1f Mon Sep 17 00:00:00 2001
From: Darren <darren@darrenwhitlen.com>
Date: Sat, 13 Jun 2020 15:34:06 +0100
Subject: [PATCH] Don't add buffers with an empty name

---
 src/libs/BouncerProvider.js | 7 +++++++
 src/libs/state.js           | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/src/libs/BouncerProvider.js b/src/libs/BouncerProvider.js
index 5a322a6b3..1b61d571d 100644
--- a/src/libs/BouncerProvider.js
+++ b/src/libs/BouncerProvider.js
@@ -163,6 +163,13 @@ export default class BouncerProvider {
         let buffers = await client.bnc.getBuffers(bncNetwork.connection.bncnetid);
         buffers.forEach((buffer) => {
             let newBuffer = this.state.addBuffer(bncNetwork.id, buffer.name);
+            if (!newBuffer) {
+                // The BNC might be giving up bad buffer names or something, so just make sure
+                // that it's handled if it ever coccurs
+                log.error(`Couldn't add BNC network, '${buffer.name}'`, buffer);
+                return;
+            }
+
             if (buffer.joined) {
                 newBuffer.enabled = true;
                 newBuffer.joined = true;
diff --git a/src/libs/state.js b/src/libs/state.js
index cca8722fc..ac7355092 100644
--- a/src/libs/state.js
+++ b/src/libs/state.js
@@ -471,6 +471,10 @@ function createNewState() {
             },
 
             addBuffer(networkid, bufferName) {
+                if (!bufferName) {
+                    return false;
+                }
+
                 // If we already have this buffer, don't re-add it
                 let buffer = this.getBufferByName(networkid, bufferName);
                 if (buffer) {