From df6e8817099040d3f0428ad5b3d4f8d2efa4f8bc Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Fri, 4 Dec 2020 21:22:31 +1300
Subject: [PATCH] Fixing the list of servers available not being persisted

---
 src/js/services/mopidy/middleware.js | 10 ++++++++--
 src/js/store/index.js                | 17 ++---------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js
index ace5cf1e..83f667d7 100755
--- a/src/js/services/mopidy/middleware.js
+++ b/src/js/services/mopidy/middleware.js
@@ -436,8 +436,14 @@ const MopidyMiddleware = (function () {
         break;
 
       case 'MOPIDY_UPDATE_SERVER':
-        let servers = store.getState().mopidy.servers;
-        servers[action.server.id] = { ...servers[action.server.id], ...action.server };
+        const existingServers = store.getState().mopidy.servers;
+        const servers = {
+          ...existingServers,
+          [action.server.id]: {
+            ...existingServers[action.server.id] || {},
+            ...action.server,
+          },
+        };
         store.dispatch(mopidyActions.updateServers(servers));
         break;
 
diff --git a/src/js/store/index.js b/src/js/store/index.js
index 2cfda269..5308a99d 100755
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -177,21 +177,8 @@ const mopidyPersistConfig = {
   key: 'mopidy',
   storage: localForage,
   debug: window.test_mode,
-  whitelist: [
-    'consume',
-    'current_server',
-    'host',
-    'port',
-    'library_albums_uri',
-    'library_artists_uri',
-    'mute',
-    'play_state',
-    'random',
-    'repeat',
-    'servers',
-    'ssl',
-    'uri_schemes',
-    'volume',
+  blacklist: [
+    'connected',
   ],
 };