Fix #199

trazyn · Jul 15, 2018 · 14bb67d · 14bb67d
1 parent bd2619c
commit 14bb67d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/js/pages/Welcome/index.js b/src/js/pages/Welcome/index.js
@@ -196,6 +196,10 @@ class Welcome extends Component {
     renderFavorite(favorite = {}) {
         var { classes, controller } = this.props;
 
+        if (favorite.size === 0) {
+            return false;
+        }
+
         return (
             <Link
                 className={classes.clearfix}

diff --git a/src/js/stores/home.js b/src/js/stores/home.js
@@ -23,11 +23,14 @@ class Home {
             // Save the songs of red heart
             me.rocking(favorite);
 
-            if (recommend.length) {
+            if (favorite.size) {
+                controller.setup(favorite);
+            } else if (recommend.size) {
                 // Play the recommend songs
                 controller.setup(recommend);
             } else {
-                controller.setup(favorite);
+                // Some user no favorite and recommend, set a fallback playlist
+                controller.setup(res.data.list[2]);
             }
         } else {
             res = await axios.get(`/api/home`);