Merge branch 'release/4.3.0' into develop

2 files changed, 5 insertions, 2 deletions

diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html
index eb4f84d11..f7abb7ede 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.html
+++ b/client/src/app/+admin/follows/following-list/following-list.component.html
@@ -1,6 +1,6 @@
 <h1>
   <my-global-icon iconName="following" aria-hidden="true"></my-global-icon>
-  <ng-container i18n>Your instance subscriptions</ng-container>
+  <ng-container i18n>Subscriptions of your instance</ng-container>
 </h1>
 
 <p-table
diff --git a/server/lib/video-state.ts b/server/lib/video-state.ts
index 9ebbd7679..893725d85 100644
--- a/server/lib/video-state.ts
+++ b/server/lib/video-state.ts
@@ -82,7 +82,10 @@ async function moveToExternalStorageState (options: {
   if (pendingTranscode !== 0) return false
 
   const previousVideoState = video.state
-  await video.setNewState(VideoState.TO_MOVE_TO_EXTERNAL_STORAGE, isNewVideo, transaction)
+
+  if (video.state !== VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) {
+    await video.setNewState(VideoState.TO_MOVE_TO_EXTERNAL_STORAGE, isNewVideo, transaction)
+  }
 
   logger.info('Creating external storage move job for video %s.', video.uuid, { tags: [ video.uuid ] })