From 21309ba2802e001d275a59e79e34eb83e0280847 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Sun, 13 Aug 2017 09:43:45 -0700
Subject: [PATCH] Remove speed from activity when transcode throttled

---
 data/interfaces/default/current_activity_instance.html | 7 ++++---
 data/interfaces/default/index.html                     | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html
index bf1fce7a..2627aab9 100644
--- a/data/interfaces/default/current_activity_instance.html
+++ b/data/interfaces/default/current_activity_instance.html
@@ -140,13 +140,14 @@ DOCUMENTATION :: END
                         </div>
                         <div class="dashboard-activity-info-details-transcode-state" id="transcode-state-${data['session_key']}">
                             % if data['video_decision'] == 'transcode' or data['audio_decision'] == 'transcode':
+                                Stream &nbsp;<strong>Transcode
                                 % if data['transcode_hardware'] == '1':
-                                Stream &nbsp;<strong>Transcode (HW) (Speed: ${data['transcode_speed']})
-                                % else:
-                                Stream &nbsp;<strong>Transcode (Speed: ${data['transcode_speed']})
+                                (HW)
                                 % endif
                                 % if data['transcode_throttled'] == '1':
                                 (Throttled)
+                                % else:
+                                (Speed: ${data['transcode_speed']})
                                 % endif
                                 </strong>
                             % elif data['video_decision'] == 'copy' or data['audio_decision'] == 'copy':
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index 941f7516..982a8ca8 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -284,9 +284,9 @@
                         // if transcoding, update the transcode state
                         var ts = '';
                         if (s.video_decision == 'transcode' || s.audio_decision == 'transcode') {
-                            var throttled = (s.throttled == '1') ? ' (Throttled)' : '';
+                            var throttled = (s.throttled == '1') ? ' (Throttled)' : ' (Speed: ' + s.transcode_speed + ')';
                             var hw = (s.transcode_hardware == '1') ? ' (HW)' : '';
-                            ts += 'Stream &nbsp;<strong>Transcode' + hw + ' (Speed: ' + s.transcode_speed + ')' + throttled + '</strong><br>';
+                            ts += 'Stream &nbsp;<strong>Transcode' + hw + throttled + '</strong><br>';
                         } else if (s.video_decision == 'copy' || s.audio_decision == 'copy') {
                             ts += 'Stream &nbsp;<strong>Direct Stream</strong><br>';
                         } else {