Merge branch 'release/4.2.0' into develop

3 files changed, 9 insertions, 1 deletions

diff --git a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
index b8e6136fb..fd8cd7ffc 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
+++ b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
@@ -15,6 +15,8 @@ my-actor-avatar {
 }
 
 .actor-info-display-name {
+  @include peertube-word-wrap;
+
   font-size: 20px;
   font-weight: $font-bold;
 
diff --git a/client/src/app/shared/shared-video-miniature/videos-selection.component.scss b/client/src/app/shared/shared-video-miniature/videos-selection.component.scss
index 3bb375980..1827f25ef 100644
--- a/client/src/app/shared/shared-video-miniature/videos-selection.component.scss
+++ b/client/src/app/shared/shared-video-miniature/videos-selection.component.scss
@@ -9,6 +9,7 @@
 
 .action-selection-mode-child {
   position: fixed;
+  display: flex;
 
   .action-button {
     @include margin-left(55px);
diff --git a/client/src/standalone/videos/embed.html b/client/src/standalone/videos/embed.html
index f30dda96b..eab6f81a6 100644
--- a/client/src/standalone/videos/embed.html
+++ b/client/src/standalone/videos/embed.html
@@ -67,7 +67,12 @@
         if (placeholderPreview) placeholderPreview.style.display = 'none'
       }
 
-      window.onerror = function () {
+      window.onerror = function (msg) {
+        if (typeof msg === 'string' && msg.toLowerCase().includes(' ice ')) {
+          console.warn(msg)
+          return
+        }
+
         window.displayIncompatibleBrowser()
       }