Merging from PR #588, fixes #627 and #582

2020-11-14 22:19:48 +13:00
parent e0e9c70769
commit b614b4a5a4
12 changed files with 212 additions and 555839 deletions
--- a/src/js/components/PlaybackControls.js
+++ b/src/js/components/PlaybackControls.js
@ -257,7 +257,9 @@ class PlaybackControls extends React.Component {
              </Link>
              <div className="text">
                <div className="title">
-                  {current_track ? current_track.name : <span>-</span>}
+                  {stream_title && <span>{stream_title}</span>}
+                  {!stream_title && current_track && <span>{current_track.name}</span>}
+                  {!stream_title && !current_track && <span>-</span>}
                </div>
                <div className="artist">
                  {