hide media badge when disabled and not playing

2 files changed, 5 insertions, 3 deletions

diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 5b901f3bf..ccf4e8d18 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -350,9 +350,10 @@ class TabItem extends Component {
       );
     }
 
-    const mediaBadge = service.isMediaPlaying ? (
+    const showMediaBadge = service.isMediaPlaying && service.isEnabled;
+    const mediaBadge = (
       <Icon icon={mdiVolumeSource} className="tab-item__icon" />
-    ) : null;
+    );
 
     return (
       <li
@@ -379,7 +380,7 @@ class TabItem extends Component {
         )}
         {notificationBadge}
         {errorBadge}
-        {mediaBadge}
+        {showMediaBadge && mediaBadge}
         {IS_SERVICE_DEBUGGING_ENABLED && (
           <>
             <div
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index f0cb48e5e..0eaf641e3 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -43,6 +43,7 @@ class TabBar extends Component {
         serviceId,
         serviceData: {
           isEnabled,
+          isMediaPlaying: false,
         },
         redirect: false,
       });