Fallback for empty queue (undefined) now empty array, fixes #637

2020-11-15 16:43:45 +13:00
parent f884c57c14
commit 7b60f53fcd
1 changed files with 8 additions and 4 deletions
--- a/src/js/util/selectors.js
+++ b/src/js/util/selectors.js
@ -28,10 +28,14 @@ const makeLoadingSelector = (keys) => createSelector(
 const getQueueHistory = (state) => state.mopidy.queue_history;
 const queueHistorySelector = createSelector(
  [getItems, getQueueHistory],
-  (items, queueHistory) => queueHistory.map((item) => ({
-    ...item,
-    ...(items[item.uri] || {}),
-  })),
+  (items, queueHistory) => {
+    if (!queueHistory || !queueHistory.length) return [];
+
+    return queueHistory.map((item) => ({
+      ...item,
+      ...(items[item.uri] || {}),
+    }));
+  },
 );

 const makeLibrarySelector = (uris) => createSelector(